diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-18 14:05:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-18 14:05:00 +0000 |
| commit | 10860db5f155052ca0d353ce9058e1c16eec8437 (patch) | |
| tree | c1ae5d02c5c77ddb7eecc248df264d8f38f1879d /keystoneclient/auth/base.py | |
| parent | 6c1a9b49dc2ffcaa743ebf866c7281622ffad8ad (diff) | |
| parent | b78dc19d9b47f3347a99394ee839c02f5127a986 (diff) | |
| download | python-keystoneclient-1.0.0.tar.gz | |
Merge "Take plugin params from ENV rather than default"1.0.0
Diffstat (limited to 'keystoneclient/auth/base.py')
| -rw-r--r-- | keystoneclient/auth/base.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/keystoneclient/auth/base.py b/keystoneclient/auth/base.py index 1f4ce29..4c743d9 100644 --- a/keystoneclient/auth/base.py +++ b/keystoneclient/auth/base.py @@ -155,14 +155,12 @@ class BaseAuthPlugin(object): args.append('--os-%s' % o.name) envs.append('OS_%s' % o.name.replace('-', '_').upper()) - default = opt.default - if default is None: - # select the first ENV that is not false-y or return None - env_vars = (os.environ.get(e) for e in envs) - default = six.next(six.moves.filter(None, env_vars), None) + # select the first ENV that is not false-y or return None + env_vars = (os.environ.get(e) for e in envs) + default = six.next(six.moves.filter(None, env_vars), None) parser.add_argument(*args, - default=default, + default=default or opt.default, metavar=opt.metavar, help=opt.help, dest='os_%s' % opt.dest) |