Updated openstack/openstack
Project: openstack/tempest  8748fdc1b547bfd687c96744736b1e4bc801134a
null
fix a minor bug when detecting server image flavor

* The function _detect_server_image_flavor has a parameter 'server_id',
* but does not use it (instead, it uses server_id of the class)

Change-Id: I94d46877a67c79035e4ecf3da9abc0156803f2b3
Updated openstack/openstack
Project: openstack/neutron  a253a8c9b7c34a614ee4c15ac46857c575717942
null
LBaaS: synchronize haproxy deploy/undeploy_instance methods

When creating/deleting lbaas objects at a high rate (like tempest api tests do)
deploy/undeploy_unstance methods of haproxy namespace driver
may be executed concurrently which leads to different conflicts with
network namespaces and interfaces created by the diver.

@synchronized decorator should be used in order to ensure that only one thread
will execute one of the methods at a time.

Closes-Bug: #1260692

Change-Id: Ibe86653c20c9a4e0b4e7b3b2cefbd445428b82da