Merge "compute: Add standard constants for hypervisor virt types"
Merge "Improve logging of external events on the compute node"
Fix parsing sloppiness from iscsiadm discover

As reported by a user, iscsiadm might spew some other random gorp when
it starts up, and if it does, nova explodes poorly. Put a modicum of
sanity testing into the parsing of the output to make this less
likely.

Change-Id: Iaf55438bb3ec412187158e80f9fbc1d8e7071207
Closes-Bug: #1308649
Merge "Proxy nova baremetal commands to Ironic"
Merge "Fix for volume detach error when use NFS as the cinder backend"
Merge "xenapi: send chunk terminator on subprocess exc"
Merge "Add quotas for Server Groups (V2 API change)"
Merge "Fixes a Hyper-V list_instances localization issue"
Merge "Add quotas for Server Groups (quota checks)"
Merge "Ironic: don't canonicalize extra_specs data"
Merge "neutronv2: attempt to delete all ports"
Merge "Nova-net: fix server side deallocate_for_instance()"
Merge "Add new unit tests for PCI stats"
Merge "Process power state syncs asynchronously"
Merge "Stash numa-related flavor extra_spec items in system_metadata"
Merge "Hook NUMA topology checking into claims"
Merge "Make resource tracker track NUMA usage"
Merge "API boot process sets NUMA topology for instances"
Correct baremetal/ironic consume_from_instance...

In 2bc74e66d90b6fae3c5ca8f79f99e75169da644f we recently changed
the HostState.consume_from_instance method parameters to include a
context. This patch updates the relevate baremetal/ironic host state
classes to do likewise.

This fixes a critical TypeError that occurs when trying to use
Ironic or Nova Baremetal otherwise.

Change-Id: I46eebce19603cb4c4a934b1647ff6433d75799ad
Closes-bug: #1369151
Merge "Make HostManager track NUMA usage"