Fix FLAGS.volumes_dir help message

And other nova/volume/iscsi.py typos

Change-Id: I781a07b4f11b6cf336c278a6994bd5575ae1a70a
Sync a change to rpc from openstack-common.

This commit pulls in the following change from openstack-common:

    ee44222 Change the qpid_heartbeat default to 60 seconds.

Fix bug 1050661.

Change-Id: I999e16c18227f9aab4dc8c2ff88cd6907c7c8191
Update quota when deleting volume that failed to be scheduled

If one volume was failed to get scheduled, removing such volume should
also clean up reservation.
Also when create_volume is ready to send to scheduler, reservation
should be committed no matter backend can successfully create that
volume or not since deleting volume call will do a minus reservation
even on volume with 'error' status.

Fix bug 1052052

Change-Id: Iaec9926024ad5adb38b08b07772095f49b8593c2
Merge "Fix FLAGS.volumes_dir help message"
Fix volume deletion when device mapper is used

Call dmsetup remove if there is a /dev/mapper/nova--volumes-
element present.

Resolves bug 979020

Change-Id: Iddaaed411a77dda4bd32f9a97687ff17744119eb
Merge "Update quota when deleting volume that failed to be scheduled"
Clean up db.volume_create()

 Adding the metadata return to db.volume_create() introduced some
 messy and unnecessary repitition in the code.  This patch
 cleans that up and makes use of existing volume_get functions rather
 than duplicating the code in volume_create.

 This syncs cinder up with the patch as it's been submitted for nova
 in https://review.openstack.org/#/c/10461/

 Addresses bug #1052176

Change-Id: I17aca069fbb0240770613f176430a1b2fcf2b25a
Merge "Fix volume deletion when device mapper is used"
Merge "Clean up db.volume_create()"
Mark Cinder 2012.2 Final as we near RC1

Mark Final=True as we prepare to publish Folsom RC1.

Change-Id: Ie95dd290aef49633586a4b483c3c80dca3e72aa2
Correct IetAdm remove_iscsi_target

Remove logical units should be done before delete the target while
unexport iSCSI volume. Or ietd will show "No such file or directory"
error.

Fix bug 1043107

Change-Id: Iab5b97044c5a30c788fcabce827923ff82a84b91
(cherry picked from commit f14e955735065a998cd78280661f6d33c850d9e2)
Add nova migrate_version check to cinder import

Cinder-manage migrate import only works from Nova/Folsom--->Cinder/Folsom
this change adds an explicit check of the nova migrate_version (133)
to make sure we have all of the volume id/uuid changes that are needed
to be compatable, and presents an error message if that's not the case.

Addresses bug #1052598

Change-Id: I7f32cf35e33320f4348b7bc44a8e92b5716b71d8
(cherry picked from commit 321d32379cd6044378f2f9c32c068de18f514df5)
Merge "Correct IetAdm remove_iscsi_target" into milestone-proposed
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: Ie3299f5065e2b084644ec2956f0c6ebae4264a49
(cherry picked from commit 3b8a6303e6c04f0c7b45043c2fcd53948910d37e)
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: If82a66c6a78ab03da09223a7b79abe559a6f702f
(cherry picked from commit f55198570fd59b7a2a4ddd2f5e77b3d03d0a3d64)
Set the default availability zone back to nova

Currently nova and cinder have to have the same set of az's for
the ec2 api to work properly. Therefore, set the default az for
cinder to nova so they will match.

Includes a hack to az to set cinder to nova to work around gate
issues. The hack can be removed once the gate sets the zone to
nova properly.

Fixes bug 1053508

Change-Id: I9c30ccc5c79b9c4e6c1ebeb3e80d0098e1ffbb11
(cherry picked from commit d051ca9cdf828b1e47ef5158c4b83beb9484109e)
Merge "Set the default availability zone back to nova" into milestone-proposed
Remove cinder gating hack

The hack was necessary while we switched the name used for az's
in the gating tests. Now it can be removed

Change-Id: I970205910ac0950ab4a961aa0537eb964d7f0d3c
(cherry picked from commit bc0fb113af225878b4305da7d834673a6b7f5e97)
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: I559cca8ffc2a33beff22025e42a9713487245980
(cherry picked from commit a1cbbe2e9e5d7a5ec55ec1197571cd68fcdbad15)
Merge "Stop double logging to the console" into milestone-proposed