Merge "Make scheduler modules pass conductor to add_instance_fault"
Fixes 'not in' operator usage

Change-Id: I1e26a8fcb9fa564308e63c11a72aaa55119e4eee
Handle compute node not available for live migration

This patch handles exception.ComputeServiceUnavailable by restoring
instance's vm_state and instance's task_state after live migration
failure caused by unavailable source/dest compute node.

Raises detailed HTTPBadRequest explanation for this exception.

Fixes bug 973393 and bug 1051881

Change-Id: If825b61fad9c4e3030f2e6c5002907255eaf3661
Merge "Fixes "is not" usage"
Merge "Pass parameter 'filter' back to model layer"
Merge "Fixes 'not in' operator usage"
instance.update notifications don't always identify the service

instance_update in conductor/manager.py doesn't identify the service
when calling notifications.send_update(), resulting in mesages on the
notification queue having a service value of None.

This change makes sure that the correct service is identified even
when running conductor in local mode

Change-Id: I1b22c0b46040f51ba715a4d9fa19ef4c98359070
Quantum metadata handler now uses X-Forwarded-For

fixes bug 1097524

The guest IP address was not properly forwarded from the Quantum
metadata proxy.  This patch adds support in Nova for reading this
X-Forwarded-For header.  Previously, the internal proxy IP was
mistakenly used exposing internal infrastructure details.

Change-Id: I6d7d21e2aea4ca5debf1ca4ba6802012537f78a5
Use conductor for instance_info_cache_update.

This patch updates the network API to be able to use the conductor API
to be able to update the instance info cache.

A previous commit, 5731852f91c32fe09db541888d3fee9e3139fc43, updated
the compute manager to use this method from conductor when getting
network info.  This patch builds on that by moving the conductor usage
down to the network API and using it in more places.  Specifically, the
network API calls used by the compute manager that use the refresh_cache
decorator were updated.

The refresh_cache decorator now checks for a conductor_api kwarg and
will use the conductor to update the cache if it's not there.  Otherwise
it goes back to default behavior of using the db directly.

Change-Id: Ib5e17f5f8fb4ee14e3ed305057d18d40f2e905e5
import tools/flakes from oslo

Change-Id: Id6d99fe1fd39e8c061f591e9a82058aea9664674
Merge "Add api samples to fping extension"
Merge "Code cleanup for rebuild block device mapping"
Merge "xenapi: Ax unecessary `block_device_info` params"
Merge "Use _prep_block_device in rebuild."
Merge "DRYing up volume_in_mapping code."
Merge "Fix rebuild with volumes attached"
Fixes FloatingIPDNS extension 'show' method.

Changes the 'show' method to also work when 'id' is actually
an IP and calls the right method to return a list of DNS entries
for a given domain and IP when the called method is
'v2/{tenant_id}/os-floating-ip-dns/{domain}/entries/{ip}'.

Fixes bug 1089410

Change-Id: I4c424e091209624324754c548e55bbbb304cf79f
Fixes unhandled exception in detach_volume

* Fixes the use case where an exception should have been raised when libvirtd
goes down and a volume is being detached.
* Added unit tests for detach_volume, but skipped one unit test for compute
cells as it is giving an error (TypeError: detach_volume() takes exactly
3 arguments (4 given))

Fixes bug #1101079
Change-Id: I6d83947a0344c5f2d91014de6a2052a881198bb4
Merge "Fixes unhandled exception in detach_volume"
Merge "Fixes FloatingIPDNS extension 'show' method."