Added description of operators for extra_specs

There are several new operators added for extra_specs that are used
in compute capability filter and aggregate filter. These are
described in document in this patch. Fixed bug 1047036.

Change-Id: Id86c6672d7bda458ecb918f1900d6f8a9526ad41
libvirt: return after soft reboot successfully completes

A soft reboot shuts down an instance, waits for the instance to shutdown,
then starts the instance and waits for the instance to finish starting.
However, instead of returning success, it continues back into the loop
and waits for the instance to be shutdown again.

That will continue until the soft reboot times out, which is by default
120 seconds.

This manifested itself as a unit test that would consistently take 120
seconds to run, but could possibly affect deployed environments by
restarting instances that are shutdown shortly after a soft reboot.

Change-Id: I012c53343be4b4eb943643903fc47c7fe70a594d
Merge "Added description of operators for extra_specs" into milestone-proposed
Add lun number (0) to model_update in HpSanDriver

The HpSanDriver was not setting the lun number in model_update
and as a result default value of 1 was being used.  Trouble is the
Lun number used by LeftHand is 0, so the connect info would be
wrong and fail when trying to attach the volume.

Fixes bug #1053717

Change-Id: I2391db062dff35365030e33c3eb0569fdd397949
Fixes to the SolarisISCSI Driver

Even when the san_is_local config option was set to false, the
SolarisISCSIDriver's _execute method was accidentally set to
util.execute by the VolumeDriver's __init__ method.

Fix bug 1053041

Change-Id: Ifd8436874759d75633da3dbbfa01bd99f979ddea
Fix live migration when volumes are attached

There was some safety code in live-migration to make sure volumes
were exported before trying to live-migrate volumes. This code is
broken with cinder as it doesn't expose a way to do this. Since the
code was basically just a safety measure, this just deletes it so
live migration works again.

Fixes bug 1050421

Change-Id: I3ecd58dc2c37eab30ebfa04140475a9198aede67
(cherry picked from commit 683d13604103102112565fe5f93f064c5e4cb1f7)
Update volume detach smoke test to check status.

Updates test_007_me_can_detach_volume so that it waits for
the volume status to become active for up to 10 seconds
after initiating the command to detach the volume.

Previously it just waited for 5 seconds without checking the
status which can be problematic in that it causes the
subsequent test to delete the volume to fail intermittently
(because only active or error volumes can be deleted).

I noticed this in SmokeStack because 2 days ago this commit landed:

b46f224f7555e3065b0daacd101b65d86117f0c1

and it is now causing a fair amount of intermittent volume
tests to fail for Nova and Cinder. Apparently now that we
have ordered the commands to remove an iscsi target properly
it takes a bit longer...

Change-Id: Ibfd25af93f9cb063a76a04138b8d23d28a01b89a
Stop double logging to the console

The code in nova for logging added an extra root handler to be
able to log messages to the console during log setup. This handler
was removed in the setup method. The common setup method no longer
removes this handler, so don't create it. Note that there may be
a small period before the logging setup is finished where messages
will not appear.

Fixes bug 1053512

Change-Id: I879360ecd60d607112b1210d7afd5860e9ccb295
(cherry picked from commit aed10b2c8ba7ce22ae51c6094a6f064e5dcf2b52)
Fix solidfire option declaration

Fixes bug #1053427

The sf_allow_tenant_qos option is a boolean, not a string.

Change-Id: I7d1e8c7e8f545710314395c91e269f08cc110c36
(cherry picked from commit 60563568293ae29c89c0f425d39ddd71b603faba)
Adds deserialization for block_device_mapping

The os-volumes extension adds the ability to boot from a volume
or snapshot by including block_device_mapping in the server create
request. This patch adds code to the xml deserializer so
block_device_mapping can be specified via xml as well.

Fixes bug 1052695

Change-Id: I3e586abb32976df98d70c29b6a021fd01c4c186b
(cherry picked from commit f30387d88377b88d8bc9ef248875f8b568033ba4)
Recreate nw_info after auto assigning floating ip.

When auto assigning floating IPs recreate the nw_info array
so that API calls to get instance details will immediately
display the assigned floating IP info.

Fixes LP Bug #1053479.

Change-Id: Ia58a5391099317479d968fcf01682229926a4a99
(cherry picked from commit ff8e3efb98bcd7301ce41683a1ee542ffc0ad3d8)
Merge "Stop double logging to the console" into milestone-proposed
Merge "Fix solidfire option declaration" into milestone-proposed
Merge "Adds deserialization for block_device_mapping" into milestone-proposed
Ensure hybrid driver creates veth pair only once.

Fixes bug 1053312

This commit fixes a bug that an instance can't obtain IP address by DHCP
when using LibvirtHybridOVSBridgeDriver. When nova-compute launches an
instance on KVM, vif driver plug() may be called twice and this causes
a behavior that a port of OVS cannot seen as a bridge port. So this patch
make sure create_veth_pair() is not called if a port already exists.

Change-Id: I76792df9f0dd28224d7d57989bf1e8ecadb92606
(cherry picked from commit 577ba6267994baecd5f9e05105624536d320cc9b)
Set volume status to error if scheduling fails.

Fix bug 1053931.

When scheduling volume creation fails, the volume was left with a status
of 'creating'.  This patch changes the scheduler manager to set the
status to 'error' if scheduling fails.  This matches the behavior of the
cinder scheduler manager in this case.

This particular issue was addressed in Cinder as a part of commit
f758bde47439be52a743b2b4181d4900f2c1bc8a.

Change-Id: Ieb453ab05b3b84de53f72323c536a9567555df1e
(cherry picked from commit 75fa03557fd6f1e7c62079e9e89556f1af139202)
Merge "Recreate nw_info after auto assigning floating ip." into milestone-proposed
Merge "Ensure hybrid driver creates veth pair only once." into milestone-proposed
Merge "Fix live migration when volumes are attached" into milestone-proposed
Merge "Set volume status to error if scheduling fails." into milestone-proposed