diff options
| author | Zuul <zuul@review.openstack.org> | 2017-10-19 02:12:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-19 02:12:06 +0000 |
| commit | a8364340dd21133831b5f13754bb4a1f7debd4e5 (patch) | |
| tree | a65e32f4a56109757ed56a2b7e4938dc55d31548 /cinderclient/shell.py | |
| parent | f6f5a706ba1f2ee38bd066d9313f88735cde121c (diff) | |
| parent | ce1013d6b3b19baf81e393febe8a708cbe747f7b (diff) | |
| download | python-cinderclient-a8364340dd21133831b5f13754bb4a1f7debd4e5.tar.gz | |
Merge "Fix OS_AUTH_TYPE env var usage"
Diffstat (limited to 'cinderclient/shell.py')
| -rw-r--r-- | cinderclient/shell.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 8e88685..c7792b0 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -140,7 +140,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') or + utils.env('OS_AUTH_SYSTEM')), help=_('DEPRECATED! Use --os-auth-type. ' 'Defaults to env[OS_AUTH_SYSTEM].')) parser.add_argument('--os_auth_system', @@ -148,7 +149,8 @@ class OpenStackCinderShell(object): parser.add_argument('--os-auth-type', metavar='<os-auth-type>', dest='os_auth_type', - default=utils.env('OS_AUTH_TYPE'), + default=(utils.env('OS_AUTH_TYPE') or + utils.env('OS_AUTH_SYSTEM')), help=_('Defaults to env[OS_AUTH_TYPE].')) parser.add_argument('--os_auth_type', help=argparse.SUPPRESS) |