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
Return 400 if create volume snapshot force parameter is invalid

Fixes bug #1014689

* Add is_valid_boolstr function in utils.py
* Add force parameter check in SnapshotsController.create()
* Add unittest for invalid force parameter.

Change-Id: I0f64326f33eb4fad1cf384bd825f56f09e935f40
(cherry picked from commit c678b045c9839ed30e13fe5e7e655e3cb2e2c3f9)
Fix cinder-volume-usage-audit

It seems many point in the internal API and openstack.common changed, but
this binary has been forgotten.

Also, context ie needed when using the notifier, so import it.

This fixes bug #1053502

Change-Id: I306b8671e7b0ed8c2ce2548a51a4c5e6393e13cb
Signed-off-by: Julien Danjou <julien@danjou.info>
(cherry picked from commit 186143ecc81369c02aca51b81feb976259bcad41)
Add missing entries in setup, fix up pip-requires

setup.py still has references to nova/compute and was missing some
requires statements, and more importantly didn't hvae the install_requires.

Also, tools/pip-requires needed lxml versions set, as well as
added the missing setuptools_git entry.

This was exposed when trying to run Grenade as the requires.txt
file was never generated.

Fixes bug #1055693

Change-Id: Iaf9669d66e89507989ef3fde630dc2b488a97cfc
(cherry picked from commit 7f00d13640edac8136241e546076f2106f7bfa61)
Revert explicit usage of tgt-adm --conf option.

Fixes bug 1056246.

This reverts commit 0903603971033536751ba40df98a3c39175d3189.

This ensures that we fail-fast if the tgtd configuration does
not include the directory for volume iscsi target configs,
instead of only blowing up when tgtd is restarted.

Change-Id: I30aa3f1d8944eb33cd4a42d65e227031023406b4
Fix NetAppCmodeISCSIDriver._get_lun_handle() method

bug 1055578

Change-Id: I06da6a9a59fa2320f1cae9698e5e63562e534916
(cherry picked from commit b2627b27dae521d719b90831dcc41695b389712f)
Fixes remove_export for IetAdm

* Corrects indentation.
* Uses specific iqn as keyword argument.

Fixes bug 1055401

Change-Id: Ie99dd8a34924f0d7f447cf41a305353659a51d11
(cherry picked from commit 5b61536fdf17332f48af4b422fe23c2e153934a1)
Merge "Revert explicit usage of tgt-adm --conf option." into milestone-proposed
Merge "Fix NetAppCmodeISCSIDriver._get_lun_handle() method" into milestone-proposed
Ensure we don't access the net when building docs

(Note, this has not been sent upstream)