Updated openstack/openstack
Project: openstack/cinder  01f5efad463dafe0a6f4553e12907880f1f126c4
null
VMware: Fixed upload-to-image for available volume

Cinder generally does not allow upload-to-image operation on a volume
that is 'in-use'. This can however be over-ridden using the '--force True'
flag. The VMware driver cannot support upload-to-image when the volume is
in-use. This is a restriction for the VMware driver alone. When the user forces
an upload on a volume that is 'in-use' the Cinder api layer sets the volume
status to 'uploading' and calls into the driver code to upload. In this
scenario the VMware driver needs to fail the operation.

The current driver code here does this check wrongly by looking for volume
status of 'in-use'. Fixing this check to identify an in-use volume correctly.

Fixes bug: 1237338

(cherry picked from commit a2b774c0ce2a1aaa9cdfc7d7c4c4d642f1bfc3d1)

Change-Id: If54edfdc242a7a1bff442b6bb4c5a9865eede1dc
Updated openstack/openstack
Project: openstack/ceilometer  78366f6f3ad75da9baa5756f72320e4e996a764c
null
Ensure the correct error message is displayed

When a untranslated error message pass through the translation pecan
hook, the previous translated error is send to the client.

This patch fix that by reseting the "translatable_error" of the
translation pecan hook before each request.

Conflicts:

    tests/api/v2/test_app.py

Change-Id: Icee79cf09fd696655048c7c0cf8a3d6706e31701
Fixes: bug #1260398
(cherry picked from commit 02d017022bab577b581b58f42b468bf0b2c644a9)
Updated openstack/openstack
Project: openstack/cinder  901b1ee5c78761c78a6baf4212861ddd40007cdc
null
NetApp fix for vsadmin role failure for ssc

The ssc feature does not work with vserver admin
role. If the user is a vsadmin then he does cannot
use the ssc feature fully. This fix checks the access
and issues apis appropriately and also handles error
conditions.

Closes-Bug: #1253657

Change-Id: Ibc4409e5d5e6e36bba41e5f59dd94c05b87b1cde
(cherry picked from commit 20667f7d49eed88ddd528be73293a624b3af1ba0)