Merge "Fixes issues found in /os-hosts API"
Fix calling setUp() method of superclass from tearDown method.

In test_netapp.py, the tearDown function was calling setUp of
superclass instead of calling tearDown of superclass. Fixed it
here.

Change-Id: Iab65e60193edcd47d09d7788b0951ef66d816e38
Merge "sync oslo changes for setup / version"
Switch to oslo.config.

The oslo-config package has been renamed. Switch to the new
version. (should fix SmokeStack).

Change-Id: Ic8cc9f53b7c4713e7bce7db47ad2021912d3b5db
Add get_volume_stats in the sheepdog driver.

1. Allow sheepdog driver to report capabilities to the scheduler.
2. add the initial test_sheepdog.py

Fixes Bug #1140162

Change-Id: I6fb1fb6714ab4ae9878b593e6eee0a94d95ef29f
Merge "NetApp: Fix for snapshot not deleted in error state."
Merge "Switch to oslo.config."
Merge "Add get_volume_stats in the sheepdog driver."
Merge "Fix 3PAR drivers to work in multi-backend mode."
Mark configuration option netapp_password secret

Mark netapp_password configuration option with secret flag.

fixes bug 1151510

Change-Id: I4b04ae610f61c30e8d061b2be710bb48d7afae66
Merge "Fix Storwize/SVC storage_protocol reporting."
Exit run_tests with the result code of the test runner.

Change-Id: Ie117e258c3ce78080ab55715daa8cf14f9967ce4
Use nose and openstack nose plugin.

It's a little silly since we're working on removing nose for testr,
but it turns out that the old test run wrapper was in use here, which was
causing all sorts of havoc.

Change-Id: Ib6e31547ec4921f91b6253a1798cb04ca6930c87
Merge "Mark configuration option netapp_password secret"
Merge "NetApp bug fix for multibackend scenario."
Pull newly merged Olso update for 'is' operator

A recent update to common/scheduler/filters/extra_specs_ops.py in
Oslo added new 'is' operator to allow Boolean check. The original
commit message was:

"Boolean values for capabilities don't work because extra_specs are
all converted to unicode. The scheduler will then check, for example,
if the boolean 'True' is equal to the unicode string 'True', and will
always return False. This patch allows admins to specify '<is> True'
in extra_specs, which will compare successfully to boolean True."

Notice extra_specs_ops now relies on strutils from Olso, so this
change pull strutils from Oslo as well.

Fix bug: # 1146306

Change-Id: I83adf707c30274a3862aa8034e72c3361fd19952
Merge "Pull newly merged Olso update for 'is' operator"
Fix volume capacity reporting

cinder-volume crashes when the decimal point is not represented by a dot
but by a comma instead. This crash happens for example with the de_DE
locale.

This change replaces any comma appearing in the vgs command output with
a dot.

Test case added.

Fixes: bug #1151684
Change-Id: I831055fb7fd206a8560688ec4c25d766e92ee0f0
Update tox.ini to support RHEL 6.x.

In order to support running unit tests on RHEL 6.x we need to patch
eventlet with contrib/redhat-eventlet.patch. We already
have support for this in the tools/install_venv_common.py but we
need to make a couple changes to allow tox to consume this:

1) Sync in the latest intall_venv_common.py from oslo. This changes
 patch to use the -N option (ignore already applied patches) and
 makes it safe to call the patching function more than once.

2) Add a new patch_tox_venv.py script in tools.

3) Update tox.ini to call patch_tox_venv.py before it runs tests and
 coverage.

NOTE: This will hopefully go away eventually once this patch lands:

 https://bitbucket.org/eventlet/eventlet/issue/89/add-a-timeout-argument-to-subprocesspopen#comment-3342969

Change-Id: I3e2b07c3f718e4aede5c5f231ff0cdb7721ec885
Fix a few bugs for LeftHand Grizzly

This patch fixes a few issues with the LH driver.
1) attach wasn't working because there was no host
created.
2) get_volume_stats didn't exist.
3) fixed the unit tests to work with the new config
access.

Bug 1062508
Bug 1150663

Change-Id: I6f80c3d5c70b64ca6496e50fedcb6b3ca0e2be43