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"
Merge "Add the NUMATopologyFilter"
Merge "libvirt: Consider numa_topology when booting"
Make obj_make_compatible consistent

The code was originally copy pasted code with an incorrect function
name. It was modified in e274c45dcd37f49d66cc3cce72c2fd97f444151c
to have the proper function names, but no tests were added. The call
is inconsistently used as well. This modifies all the call sites
to work the same and adds a test for one of them.

Change-Id: I79d295ff49057f42f1e6609cecb5bcd38e73f8d9
Fix race condition in update_dhcp

This modifies linux_net to only make one query for the fixed ips.
Previously it was getting the list of fixed ips twice. It also
merges the convoluted logic around single_default_gateway into
the single query so that it doesn't make a db request per fixed ip.
This prevents a race condition that could lead to ips not allocating
properly if an instance is deleted while the dhcp config was being
updated. Also, e274c45dcd37f49d66cc3cce72c2fd97f444151c missed a
call to obj_make_compatible for instance version. This adds it
since it will be in a conflicting spot.

Change-Id: Iffdc60063b26c9e3f6b8dbe5b67301cbc19b2564
Resolves-bug: #1359510
Merge "Fix parsing sloppiness from iscsiadm discover"
Merge "Remove snapshot_id from _volume_snapshot_create()"