Updated openstack/openstack
Project: openstack/cinder  82feb31ea6ab53982328e91312de10ab4ef01a3a
null
Force detach should only be an admin api

Since force delete volume apis are only admin apis, force detach volume api
should also be an admin only api.  Currently, the force detach api,
which uses the default rule in policy.json, can be called by admins and owners.
This patch make force detach volume api an admin only api like force
delete volume.

Closes-Bug: #1303882
Change-Id: I12f927e816a5ba6809da9a27ac4ad150546286a1
Updated openstack/openstack
Project: openstack/nova  0cf8a414cfd79e814ecf0491444033c167809f7c
null
Revert "Fix network-api direct database hits in metadata server"

This reverts commit 79ab96e34ba5b8dd3e4e542dd3a7f65624b13367.

This commit broke the Nova metadata API when using neutron.

Change-Id: I6855b03f00492fdf51e18c0dcb0a73590a71b374
Closes-bug: #1307582