Merge "Update rootwrap with code from oslo"
Merge "Allow v2 Volume API to create volume with type name"
Merge "Fix check for mount.nfs helper installation"
Merge "Fix NetApp iscsi drivers for cinder backup"
Merge "VMware: Handles no datastores case"
Pass correct args to vol_rpc create_volume calls

In the chance and simple scheduler, create volume was originally using
snapshot_id and image_id for request_spec and filter_properties. This
corrects that by passing the correct arguments and keyword arguments to
create_volume.

Change-Id: Icbcfbfb28f36e1f75519bf5ad6fcbcc12a9b4ec1
Closes-Bug: #1212710
Merge "Fix processutils.execute errors on windows"
Merge "Revert "Fix volume_rpcapi calls for chance/simple scheds""
Fix mandatory and optional args for create_volume

Calls to create_volume (both volume_rpcapi and scheduler_rpcapi) pass
mandatory args as optional and reverse. This patch fixes the calls to be
according to the function definition.

Also, fix the call to create_volume in the migration code where
allow_reschedule defaults to True, but we don't pass request_spec so it
prints a warning and disables it.

Change-Id: I9509f88866e0ae182f90ebdfca1fcf415ca60d19
Closes-Bug: #1230069
Merge "LVM volume_clear: error on unexpected inputs"
Get host group id when Huawei driver initializing

Get host group id when Huawei driver initializing to make sure
host group id won't be None after cinder node host sys reboot.

fixes bug 1230372

Change-Id: Ia3d5de116804930b2bb0035e4c991ebb9801ee76
Use module units for some drivers

Use module units instead of number for some drivers.

Change-Id: I429590b6955f56d7ba9687b6898808a3f3bc3796
Allow upgrade from Grizzly with ThinLVMVolumeDriver

In Grizzly, LVM thin provisioning was used by setting
volume_driver=...ThinLVMVolumeDriver.  In Havana this
functionality has moved under the standard LVM driver
with the option "lvm_type=thin" used to enable it.

We should account for the old volume_driver class path
so that the volume service behaves as expected for users
upgrading from Grizzly ThinLVM configurations.

Closes-Bug: #1231116
Change-Id: Ic29f0e5c1036232078af5c6d83c61c75a35cccd4
Fix translation of CinderExceptions in REST API

When creating a Fault from a CinderException wrapped in an
HTTPException, we were converting the inner explanation to unicode
before it was able to reach the Fault's call() method which is where
translation occurs, and unicode objects can't be translated.

This patch preserves the CinderException's Message object and puts it in
another Message object as the explanation to the HTTPException so it can
be translated.

Fixes bug: #1229967

Change-Id: Ida71908b639da32b4b85846a117ef21da2fe685b
Merge "Sync gettextutils from oslo"
Clean CONF out of brick exception

This is part 3 of the work needed to
remove CONF from the brick subproject.

This patch removes the CONF usage in
the brick exception.

Fixes bug #1230066

Change-Id: Id1ad704a613bc7e2657a65407932a8ef3706bf92
Merge "Pass correct args to vol_rpc create_volume calls"
Add error logs for Huawei driver

Log some errors to avoid losing the exception messages.
HVS driver do repeated judgements for JSON results, here add error
logs and replace these judgement codes with a assertion function.

fixes bug 1229877
Change-Id: Icd1e859566e07c0f02aa0b2d5c136a2048524527
Set vol driver initialized before deleting volumes

Move the call to set_initialized before calling delete_volume in
init_host.  The delete_volume method has a precondition that the
driver be initialized.

Closes-Bug: #1232177

Change-Id: Ie73bd30e0ab80d489ab61ba8a60fac51ccb505b5
Merge "Get host group id when Huawei driver initializing"