diff options
| author | Sean McGinnis <sean.mcginnis@huawei.com> | 2017-05-31 05:57:45 -0500 |
|---|---|---|
| committer | Sean McGinnis <sean.mcginnis@huawei.com> | 2017-06-01 13:43:48 -0500 |
| commit | 7a0694084fa3538f7b72c7d4bfe283dca320d151 (patch) | |
| tree | f0e3190098ba181134ef7ea59a7aa8baa4cc9156 /cinderclient/shell.py | |
| parent | 4f1390923907c260fb95b58ce14181d2873e6373 (diff) | |
| download | python-cinderclient-7a0694084fa3538f7b72c7d4bfe283dca320d151.tar.gz | |
Fix attribute errors in os-auth-* settings
This fixes some wording and formatting issues with the help
text that is printed for CLI arguments.
The duplication of default values for os-auth-system appears
to lead to attribute errors requiring explicitly unsetting
OS_AUTH_TYPE.
Closes-bug: #1695054
Change-Id: I0263ef2fb15744f7e352c7365e7d9e61c1ebc974
Diffstat (limited to 'cinderclient/shell.py')
| -rw-r--r-- | cinderclient/shell.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 6307fdb..d36294b 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -143,9 +143,8 @@ class OpenStackCinderShell(object): parser.add_argument('--os-auth-system', metavar='<os-auth-system>', dest='os_auth_type', - default=utils.env('OS_AUTH_SYSTEM', - default=utils.env('OS_AUTH_TYPE')), - help=_('DEPRECATED! Use --os-auth-type.' + default=utils.env('OS_AUTH_SYSTEM'), + help=_('DEPRECATED! Use --os-auth-type. ' 'Defaults to env[OS_AUTH_SYSTEM].')) parser.add_argument('--os_auth_system', help=argparse.SUPPRESS) |