Merge "baremetal: Add missing method to volume driver"
Merge "Adding support for multiple hypervisor versions"
Pass volume_api to get_encryption_metadata

The module encryptors was creating a volume API instance in the module
scope which caused all the modules importing it to depend on
cinderclient.

This was affecting scheduler and cert services which at some point import
the compute manager module only to access their config options. It makes
no sense to force scheduler and cert services to require cinderclient.

This patch makes the callers of get_encryption_metadata to pass the
volume api object to this method to prevent this dependency.

Closes-Bug: #1246103
Change-Id: I9eb4ae3754fa2a5ac646560a62477d6ed672e272
Use _get_server_admin_password()

There is _get_server_admin_password() for getting an admin password
in ServersController class. This patch makes some methods use it for
code clean-up.

Change-Id: Iff9d960126e1c09d928d72b572838e6f16cc4f33
Merge "Add nova.db.migration.db_initial_version()"
Merge "Pass volume_api to get_encryption_metadata"
Merge "Add ephemeral_mb record to bm_nodes"
Add auth_token settings to nova.conf.sample.

Updates our example config file so that it includes configuration
settings for the auth_token middleware.

Includes the latest generate_sample.sh from Oslo.

Related-Bug: #1240753

Change-Id: I393a67f1f005e775928130c9241aa7e25c391ae3
Drop auth_token configs for api-paste.ini.

We now prefer to use nova.conf to configure keystoneclients
auth_token configs.

Also, Devstack has now been update to allow this:

  https://review.openstack.org/#/c/52258/

Change-Id: I2a4b300af37eddf5010b97ca796f0552941642a8
Merge "Add DeleteFromSelect to avoid database's limit"
Make virt/firewall use objects for Security Groups and Rules

This makes the virt/firewall module use SecurityGroup and
SecurityGroupRule objects instead of relying on virtapi and
conductor for these operations.

Related to blueprint compute-manager-objects
Related to blueprint virt-objects

Change-Id: I39cb9422cb15e6222f5009f64706f1528035f42d
Remove security_group-related methods from VirtAPI

This patch removes the no-longer-needed security_group-related
methods from VirtAPI.

Related to blueprint compute-manager-objects
Related to blueprint virt-objects

Change-Id: I0326f25754e7a13dfc18f207242052412189c743
Merge "Utilizes assertIsNone and assertIsNotNone - tests/api"
Merge "Fix bad typo in cloudpipe.py"
Merge "Pass thru credentials to allow re-authentication"
Merge "xenapi: workaround for failing vbd detach"
Merge "Adds V3 API samples for user-data"
Merge "Make virt/firewall use objects for Security Groups and Rules"
Merge "Remove security_group-related methods from VirtAPI"
Replace assertEquals with assertEqual - tests/api

The method assertEquals has been deprecated since python 2.7.
http://docs.python.org/2/library/unittest.html#deprecated-aliases

Also in Python 3, a deprecated warning is raised when using assertEquals
therefore we should use assertEqual instead.

This is part of blueprint assertequal

Change-Id: I72f612cc62f90a079c9c53747e3bcbfebfb8eb96