Updated openstack/openstack
Project: openstack/keystone  75e3dbf3735307601d79bec62b33b100c12eee68
null
Detangle v3 RestfulTestCase setup

The v3 RestfulTestCase and base RestfulTestCase setup were intertwined
in such a way that there was lots of duplicated work executed for each
test.

Change-Id: I345ae83f60aba0a197b08103bd457e546942eeca
Updated openstack/openstack
Project: openstack/nova  478e14b6e906e71ae7a308b5e50c97601967b7f1
null
xenapi: workaround vbd.plug race

XenServer 6.1 and above has issues where multiple calls to VBD.plug can
cause tapdisk to hang during the unplug.

Currently this causes issues when attaching the virtual disk to the
nova-compute VM. This happens during spawn and resize. Should any of
those operations happen at the same time, we run the risk of hitting the
above bug.

This change works around this issue by ensuring there is only ever one
VBD plug at once, per VM.

Fixes bug 1251716
Change-Id: Ie7a64c481a9e3874df9d5924fbb050ac7ab117db