From cbe6c59d9abd2a57e9148a9fd7cb813baed65066 Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Wed, 24 Aug 2016 05:38:54 -0400 Subject: [PATCH] Enhance help message of upload_to_image Following the commit fb2c434c2461a25193067104de766fc1142a6024 in the cinder repo the --force option to upload-to-image is ignored by default. To enable it the config option enable_force_upload must be set to true. The help text for upload-to-image in the python cinderclient should remind user that --force may not work in some cloud now. Closes-Bug: #1611667 Change-Id: Ib56fb2016d933a9bbbcb0185c50e33d2166b34e6 --- cinderclient/v2/shell.py | 3 ++- cinderclient/v3/shell.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py index 95db39dbc..e58fa0047 100644 --- a/cinderclient/v2/shell.py +++ b/cinderclient/v2/shell.py @@ -79,7 +79,8 @@ def _print_volume_image(image): default=False, help='Enables or disables upload of ' 'a volume that is attached to an instance. ' - 'Default=False.') + 'Default=False. ' + 'This option may not be supported by your cloud.') @utils.arg('--container-format', metavar='', default='bare', diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py index a6a5bbe00..97fdc7e8c 100644 --- a/cinderclient/v3/shell.py +++ b/cinderclient/v3/shell.py @@ -1402,7 +1402,8 @@ def _find_group_type(cs, gtype): default=False, help='Enables or disables upload of ' 'a volume that is attached to an instance. ' - 'Default=False.') + 'Default=False. ' + 'This option may not be supported by your cloud.') @utils.arg('--container-format', metavar='', default='bare',