Merge "Remove duplicated code in test_user_data"
Merge "Allow to create a flavor without specifying id"
Merge "Backport V3 flavor extraspecs API unit tests to V2"
Fix CellStateManagerFile init to failure

Currently, specifying a cells_config file in nova.conf causes
CellStateManager to fail and in turn stops the nova-cells service from
starting. The reason is that CellsManager creates an instance of
CellStateManager with no arguments. CellStateManager __new__ runs and
creates an instance of CellStateManagerFile which runs __new__ and
__init__ with cell_state_cls and cells_config_path set. At this point
__new__ returns CellStateManagerFile and the new instance's __init__
method is invoked (CellStateManagerFile.__init__) with the original
arguments (there weren't any) which then results in:
2014-04-29 11:52:05.240 16759 TRACE nova self.state_manager =
cell_state_manager()
2014-04-29 11:52:05.240 16759 TRACE nova TypeError: __init__() takes
exactly 3 arguments (1 given)

It seems reasonable for CellStateManagerFile to derive the
cells_config_path info for itself so I have updated the code with that
change and added unit tests to catch this bug and to check that the
correct managers are still returned

Change-Id: I9021640515142a3ca95c2d9e7b03e19b529bc175
Closes-Bug: #1314677
Merge "Backport some v3 certificate API unittest to v2 API"
Merge "Change v3 extended_status to v2.1"
Allow attaching external networks based on configurable policy

Commit da66d50010d5b1ba1d7fc9c3d59d81b6c01bb0b0 restricted
attaching external networks to admin clients. This patch changes
it to a policy based check instead with the default setting being
admin only. This allows operators to more precisely configure who
they wish to allow to attach external networks without having to
give them admin access

Change-Id: I59e71f117f889f2abffddc36c1870ef1e0fe3711
DocImpact: Adds network:attach_external_network policy
Closes-Bug: #1352102
Merge "VMware: Create fake VM with given datastore"
Merge "VMware: Fix type of VM's config.hardware.device in fake"
Merge "VMware: refactor spawn() code to build a new VM"
Merge "VMware: spawn refactor _configure_config_drive"
Merge "Fix V2 unit tests to test hypervisor API as admin"
Merge "filter: add per-aggregate filter to configure max_io_ops_per_host"
Merge "Share common test settings in test_flavor_manage"
Merge "add log exception hints in some modules"
Deprecate cinder_* configuration settings

Create a new section in the configuration file called 'cinder'.
Move all of the cinder_* configuration settings to this section.

DocImpact

The table below has the changes:

+---------------------------------+----------------------------+
| 'DEFAULT' Section               | 'cinder' Section           |
|---------------------------------|----------------------------|
| cinder_catalog_info             | catalog_info               |
| cinder_endpoint_template        | endpoint_template          |
| os_region_name                  | os_region_name             |
| cinder_ca_certificates_file     | ca_certificates_file       |
| cinder_http_retries             | http_retries               |
| cinder_http_timeout             | http_timeout               |
| cinder_api_insecure             | api_insecure               |
| cinder_cross_az_attach          | cross_az_attach            |
+---------------------------------+----------------------------+

UpgradeImpact
The changes are backward compatible.

Change-Id: Ie6b3f9d60b5e149375ff3039be444538f5f50756
Merge "Raise HTTPNotFound error from V2 cert show API"
Merge "VMware: handle case when VM snapshot delete fails"
filter: add per-aggregate filter to configure disk_allocation_ratio

Adds a filter AggregateDiskFilter which provides the ability to
read from aggregates metadata the "disk_allocation_ratio".

DocImpact
Implements: blueprint per-aggregate-disk-allocation-ratio
Change-Id: I79d59fcdfb09e67ed6f12113615c673624b24a19
Merge "Add numa_topology column to the compute_node table"