Merge "Fix use of non-existant var pool."
dict_node -> canonicalize_node
Minor change of variable name
Merge branch 'nodes-in-caps' of https://github.com/NTTdocomo-openstack/nova into nodes-in-caps
Merge "Remove logging in volume tests"
Fix a TypeError that occurs in _reschedule.

Updates the compute manager so that it passes the correct
arguments to the scheduler API's run_instance function.

Fixes the following exception which will occur if an instance
is rescheduled:

  TypeError: run_instance() got an unexpected keyword argument
  'reservations'

As part the fix the FakeSchedulerAPI we use in test_compute.py
has been updated to match the arguments of the real scheduler API.

Fixes LP Bug #1038193.

Change-Id: I25782b79a7b19013b25cb94cc5569b5aa83a2df0
Fix get_vnc_console race.

There exists a window between a server create is done and when the host
is assigned by the scheduler that a request to get the vnc console will
result in a 500 error.

This patch adds a check in the compute API to ensure that the instance
has a host assigned before try to execute a rpc on the compute node.
If not, it raises InstanceNotReady (which translates to a 409 in the
OS API).

Fix bug 1037809.

Change-Id: I3f5af90d57ae84f98f787e14ccb66f1841ac0c6d
Merge "Revert to prior method of executing a libvirt hard_reboot."
Merge "Fix get_vnc_console race."
OpenStack capitalization added to HACKING.rst

Along with capitalization fixes to comments in code

Change-Id: I72ddc582001f80d954ca5a121903c689f40d08d1
Makes sure instance deletion ok with deleted data

Commit 5ad1dea4 added changed the network deallocation code to
work with deleted instances. This was done by setting the context
to read deleted records. Unfortunately this was done a little too
broadly, leading to a new bug where a deleted floating_ip will
cause an instance to not be able to be deleted.

This fixes the issue by limiting the use of read_deleted context
to only the places it is trying to access the instance record. It
adds a test  to verify that the code works with a duplicate
deleted floating_ip and updates the existing test for a deleted
instance to exercise the entire code path.

Fixes bug 1038266

Change-Id: I1aef94369e5bcf951e78e89b1eded5305cf36b53
Return HTTP 422 on bad server update PUT request.

This patch updates the /servers API and the disk config
extension so that they properly handle incorrectly formatted
server update/PUT requests.

Includes a new test cause that verifies (with extensions enabled)
that a poorly formatted PUT request to /servers returns HTTP 422
instead of a 500.

Also updated the previous test_create_missing_server test to use
test.TestException instead of Exception.

Fixes LP Bug #1038227.

Change-Id: I6b11602790778465348647bb5825b7326d50065a
Introduce ImagePropertiesFilter scheduler filter

Commit d39137fa added functionality to the ComputeFilter to filter on
architecture, hypervisor_type, and vm_mode. The existing ArchFilter
already filtered on architecture. This patch merges the ComputeFilter
functionality introduced in d39137fa with the ArchFilter to create the
ImagePropertiesFilter.  The ImagePropertiesFilter uses image properties
specified in the request_spec to filter hosts.

This patch also adds the ImagePropertiesFilter to the list of default
filters specified by the scheduler_default_filters FLAG.

Fixes LP Bug #1037339

DocImpact

Change-Id: Ifa6fccf2db266b0fe3457d58fc81fdb50ffcbc0f
Remove hard-coded 'admin' role checking and use policy instead

bug 1037786

This change removed hard-coded 'admin' role checking, and use policy check to
decide is_admin at the time of context construction. And also set
default admin role to 'admin', in policy template, to keep backward
compatibility.

Change-Id: I56b45bfdfba1b8e1391bde7fec3d4cf26c66324c
Fix typo
Remove _init_nodes()
_instances stores only node['id']
Test __init__() and update_from_compute() separately
Consider instances terminated after capabilities sent
Merge branch 'master' of https://github.com/openstack/nova into HEAD