Merge "Added tests for get_disk_bus_for_disk_dev function"
Merge "Fix the ConsolesController class doc string"
baremetal: Make volume driver use a correct source device

attach_volume() have to take the source device path from returning of
LibVirtVolumeDriver.connect_volume() rather than connection_info.

It also adds a test for attach_volume().

Change-Id: I3bee80560342104e2df614066301171624497a04
Closes-Bug: #1208707
Remove unnecessary steps for cold snapshots

Up until now when we created cold snapshots we were stopping the
instance, create an internal snapshot, extract the snapshot to a file
and then delete the internal snapshot before bringing up the instance.

If the instance is shut down, there's no concurrent writer, so the image
can be directly extracted without taking an internal snapshot first,
because the snapshot and the current state are the same.

In this patch the creation and deletion of the internal snapshot are
removed to eliminate the extra steps and optimize the creation of
snapshots a bit.

Closes-Bug: #1242819
Closes-Bug: #1247185

Change-Id: I429fa2e1e26aea321eecbf14edd11263fff525ae
virt root tests: replace assertEquals with assertEqual

assertEquals will be deprecated in Python 3.

This is part of blueprint assertequal

Change-Id: I635ba12a553c33cf962dac22bd38bfcb51ca6f61
image tests: replace assertEquals with assertEqual

assertEquals will be deprecated in Python 3.

This is part of blueprint assertequal

Change-Id: Iabce801165527856e410ac11bfb2842c26c9ad2e
baremetal: replace assertEquals with assertEqual

assertEquals will be deprecated in Python 3.

This is part of blueprint assertequal

Change-Id: I5965cd2d0e05551d5ccdfa68f385770b8801dd91
driver tests (loose ends): replace assertEquals with assertEqual

assertEquals will be deprecated in Python 3.

This is part of blueprint assertequal

Change-Id: I311fd876812eead7243c1ad820b88e83fee397ab
Allow configuring the wsgi pool size

Expose the number of greenthreads in wsgi pool to configuration. This
allows to put a limit to the number of resources like memcache
connections used.

DocImpact
Change-Id: I6e53d6e12661ed2f42a6b543891b13eec0c8300c
domainEventRegisterAny called too often

Changeid I090765802bfe443440f16722bc7c43b6280fe56a fixes
bug #1240905 but introduced a bug whereby domainEventRegisterAny
is called on every call to _get_connection.

Change-Id: Ifafc6a4c172b1521d62988ccbb3a2f51a95e323f
Fixes: bug #1250135
xenapi: Move settings to their own config section

This commit changes xenapi_* config options to their own section
with the xenapi_ prefix removed where appropriate.  The change
is done in a backwards compatible fashion such that previous
nova.conf files still work.

As part of this update the sample file and text strings are
also updated to reflect new config options.  Test cases have
been adjusted to handle the config hierarchy.

2642897d6f5b8a211424519d99feddc89c3bf180 was followed to
implement this change.

Change-Id: I2e9f720ddce284fc112d6a5651fd277e6e31a17a
Closes-Bug: 1207253
DocImpact
Merge "Make scheduler disk_filter take swap into account"
Merge "Fix OLE error for HyperV"
Merge "Remove fake_vm_ref from test_vmwareapi.py"
Merge "baremetal: replace assertEquals with assertEqual"
Merge "driver tests (loose ends): replace assertEquals with assertEqual"
Merge "virt root tests: replace assertEquals with assertEqual"
libvirt: pass instance to a log() call in the standard way

If we pass the instance in the correct way, then we get nicely
formatted logs which are easier for admins to use.

Change-Id: I27ab372a3388e2aa02491da07c616807bcbb14ef
Merge "Make the vmware pause/unpause unit tests actually test something"
Merge "image tests: replace assertEquals with assertEqual"