diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-30 08:28:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-30 08:28:33 +0000 |
| commit | f8c270113579e655fba519a3592a05d982653780 (patch) | |
| tree | cd58d3339803b0873e55b265179927b7623aa6da | |
| parent | a1dd760339cfe9022bd4826181e4dbe80cb8dd58 (diff) | |
| parent | 77c0365ce2d42adce9352cf238fbdbc7c282222f (diff) | |
| download | os-client-config-f8c270113579e655fba519a3592a05d982653780.tar.gz | |
Merge "Fix token_endpoint usage"1.13.1
| -rw-r--r-- | os_client_config/config.py | 1 | ||||
| -rw-r--r-- | os_client_config/tests/test_config.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index d5b1ab5..b572645 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -885,7 +885,6 @@ class OpenStackConfig(object): if (('auth' in config and 'token' in config['auth']) or ('auth_token' in config and config['auth_token']) or ('token' in config and config['token'])): - config['auth_type'] = 'token' config.setdefault('token', config.pop('auth_token', None)) # These backwards compat values are only set via argparse. If it's diff --git a/os_client_config/tests/test_config.py b/os_client_config/tests/test_config.py index b2ee9bb..4440ac8 100644 --- a/os_client_config/tests/test_config.py +++ b/os_client_config/tests/test_config.py @@ -489,7 +489,8 @@ class TestConfigArgparse(base.TestCase): # novaclient will add this parser.add_argument('--os-auth-token') opts, _remain = parser.parse_known_args( - ['--os-auth-token', 'very-bad-things']) + ['--os-auth-token', 'very-bad-things', + '--os-auth-type', 'token']) cc = c.get_one_cloud(argparse=opts) self.assertEqual(cc.config['auth_type'], 'token') self.assertEqual(cc.config['auth']['token'], 'very-bad-things') |