Merge "Allow user to specify image to use during rescue - V2 API changes"
Merge "make ec2 errors not useless"
Merge "Remove utils.reset_is_neutron() to avoid races"
Merge "Don't overwrite instance object with dict in _init_instance()"
Merge "Update version aliases for rpc version control"
Scheduler: enable scheduler hint to pass the group name

Commit ea6d8403bdc3c1d3ede87a2ed1c8740420c32080 partially
dealt with the problem. The actual scheduling would fail when
the group name was passed.

Change-Id: I668621770e59504164af9a2e861a59e900300bba
Closes-bug: #1303360
VMware: remove unused variable

The flag was never used since it was added in commit
24d609447399e468937f8a278854690864ffabcd

Change-Id: Ia034ccff1220783c2dd8c37c76fce24063f12682
Merge "Remove unnecessary call to fetch info_cache"
Merge "VMware: ensure rescue instance is deleted when instance is deleted"
Imported Translations from Transifex

Change-Id: Iee4c48e0df819b09d32552736eecca2a7d6f9bad
Updated from global requirements

Change-Id: I1558905310b9befb3e232eda3718a8f8a342aafe
Deprecate nova-manage flavor subcommand

The nova client already has the following flavor commands:

flavor-access-add    Add flavor access for the given tenant.
flavor-access-list   Print access information about the given flavor.
flavor-access-remove Remove flavor access for the given tenant.
flavor-create        Create a new flavor
flavor-delete        Delete a specific flavor
flavor-key           Set or unset extra_spec for a flavor.
flavor-list          Print a list of available 'flavors' (sizes of
flavor-show          Show details about the given flavor.

This covers what nova-manage flavor was providing so let's deprecate the
legacy nova-manage subcommand and mark it for removal in the K release.

There is not a bug or blueprint for this. The flavor subcommand is
completely duplicated in nova client. It is accessing the database
directly and we want to move to using flavor objects which would go
through conductor. So this could be considered part of the objects
conversion for flavors.

For some other commands like service, db and host it makes sense to
leave those so you can access the database before the api service is
running, but that's not the case for flavors.

UpgradeImpact: nova-manage flavor command is deprecated, use nova client

Change-Id: I8709bc9af4e490142e44c6dc61fd0aaa3a392b68
Merge "Add info_cache as expected attribute when evacuate instance"
Add helper method to determine disk size from instance properties

Add a _disk_size_from_instance method which by using the disk name
determine the size of the disk refered in the instance properties.
Update the method finish_migration to use this new helper.

Change-Id: I45bd3804fdabff35189421d01a0503c886c24a4c
Related-Bug: #1298975
Remove metadata's network-api dependence on the database

This makes the metadata server use instance.info_cache for getting
an instance's info cache instead of going direct to the network-api
(and thus, the database) for it. It also converts the network-api
implementation of get_fixed_ip_by_address() to use and return an
object. Since that translates to the same DB call in the end, none
of the network tests need to change.

Change-Id: Iab444b1669628604f7d96d9550eb684645c554cb
Closes-bug: #1306009
Merge "Loosen import_exceptions to cover all of gettextutils"
Merge "Ensure info cache updates don't overwhelm cells"
Xen: Retry plugin call after connection reset

When using the call_plugin_serialized_with_retry session method it will
retry if the plugin raises a RetryableError, but not if it loses the
connection to xenapi.  This adds a retry for the 'Connection reset by
peer' error that is occasionally seen.

Change-Id: Ibb36a0170e0e807ad7a4198df7b6e574c4279bed
Closes-Bug: #1200591
Merge "Updated from global requirements"
Merge "Make test computations explicit"