Merge "Clean swap_volume rollback, on libvirt exception."
Merge "Make _change_index_columns use existing utility methods"
Guard against oversize flavor rxtx_factor float

We now check that rxtx_factor provided is not greater than
the Float type to be stored in the db. While the check is not
100% accurate due to float approximation it will be very
close to the max allowable. A 400 error is returned if the
provided value is too big.

Closes-Bug: 1259213
Change-Id: I72c52fa46d75275c45e72b6f5a36106d5abf8220
Co-authored-by: Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
Sync latest db.sqlalchemy from oslo-incubator

The solution to bug 1272500 (Unit tests failing with sqllite 3.8.2-1)
is to use a newer version of db.sqlalchemy from oslo-incubator.
This sync introduces a few incompatible changes that also had to
be fixed for the unit tests to pass:

-_extra_keys in Models must be a property
-Additional utcnow calls were added, which broke some unit tests
that were incorrectly mocking timeutils.utcnow.  timeutils
provides an override method that allows fake times to be returned
in unit tests.

Change-Id: I99685c8a1086fa4e1354f1fa0a715d88d0468dc6
Closes-Bug: #1272500
Co-Authored-By: Ben Nemec <bnemec@redhat.com>
Merge "VMware: Remove some unused variables"
Merge "Make nova-network use FixedIP object for associations"
Merge "Add serializer capability to fake_notifier."
Merge "Ignore 'dynamic' addr flag on bridge configuration"
Merge "Fix exception handling miss in remote_consoles."
Merge "API schema for v3 console_output API"
Merge "Fix bittorrent URL configuration option"
Merge "Alphabetize core list for V3 API plugins"
Merge "Fix a bug in v3 API doc"
Default video type to 'vga' for PowerKVM

PowerKVM currently doesn't support 'cirrus' video type. For now, we can
detect if Nova compute is running on ppc64 or ppc architecture systems
and set the default to 'vga', which is supported on PowerKVM.

This patch did some reordering of the logic in
nova.virt.libvirt.driver.LibvirtDriver.get_guest_config in an attempt to
set the video.type depending on the compute host architecture and
implementation specifics. The video.type can still be set using
image_meta.

Change-Id: I49a1a8e6d9ebdc28d876d2f958c8cb960892f322
Closes-Bug: 1274367
Merge "Update my mailmap"
The object_compat decorator should come first.

Related to blueprint icehouse-objects.
Related to blueprint compute-manager-objects.

Change-Id: Ia5cc55aca5517359523ae71f4110b5f02a830b4d
Convert set_admin_password to objects

Related to blueprint icehouse-objects.
Related to blueprint compute-manager-objects.

Change-Id: Ibb8087579f290843dad4aa210e9e8fb2210c5058
Convert rescue_instance to objects

Related to blueprint icehouse-objects.
Related to blueprint compute-manager-objects.

Change-Id: I6448cb929e9afce814d0580eada91b8fd37befa3
Merge "Fix init of pci_stats in resource tracker"
Merge "Fix typos in hacking check warning numbers"