summaryrefslogtreecommitdiff
path: root/cinderclient/v2/shell.py
diff options
context:
space:
mode:
authorPeter Hamilton <peter.hamilton@jhuapl.edu>2014-02-11 08:36:41 -0500
committerAvishay Traeger <avishay@il.ibm.com>2014-02-12 21:38:41 +0200
commit6fd8d8e12e7788e7f5b85bc3b8ef2f6ee2eb7714 (patch)
tree13e897803d49399207015e7dd6638a16d3d07044 /cinderclient/v2/shell.py
parent7914e46b03614dde9ae4604cfe35b283d3a55253 (diff)
downloadpython-cinderclient-6fd8d8e12e7788e7f5b85bc3b8ef2f6ee2eb7714.tar.gz
Require ctrl_location for encryption-type-create
This bug fix addresses bug #1267168, adding a default value to the optional control_location parameter for the encryption-type-create command. Prior to this fix, any invocation of encryption-type-create that omitted the control_location parameter would fail. The failure arose from the expectations of the cinder volume encryption type API extension, which expects to always receive a value for the control_location on encryption type creation. control_location indicates which service will conduct the volume encryption for the encryption-type under consideration; valid options are 'front-end' (i.e., nova) and 'back-end' (i.e., cinder). The new default value is 'front-end' and is used whenever control_location is omitted from encryption-type-create invocation. For prior discussion and information, see the abandoned patch below: https://review.openstack.org/#/c/58303/ blueprint encrypt-cinder-volumes https://blueprints.launchpad.net/nova/+spec/encrypt-cinder-volumes Change-Id: I8db80929adbf5a3d818b9d3a8115067ae8e7d9e2 Closes-Bug: #1267168 DocImpact
Diffstat (limited to 'cinderclient/v2/shell.py')
-rw-r--r--cinderclient/v2/shell.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py
index 636c812..f57c8e0 100644
--- a/cinderclient/v2/shell.py
+++ b/cinderclient/v2/shell.py
@@ -1240,10 +1240,10 @@ def do_encryption_type_show(cs, args):
choices=['front-end', 'back-end'],
type=str,
required=False,
- default=None,
+ default='front-end',
help="Notional service where encryption is performed (e.g., "
- "front-end=Nova). Values: 'front-end', 'back-end' "
- "(Optional, Default=None)")
+ "front-end=Nova) Values: 'front-end', 'back-end' "
+ "(Default='front-end')")
@utils.service_type('volumev2')
def do_encryption_type_create(cs, args):
"""Create a new encryption type for a volume type (Admin Only)."""