diff options
| -rw-r--r-- | ceilometerclient/client.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/tests/unit/test_client.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index dfd0160..c00ab1c 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -288,7 +288,7 @@ def _adjust_kwargs(kwargs): if timeout <= 0: timeout = None - insecure = strutils.bool_from_string(kwargs.get('insecure')) + insecure = strutils.bool_from_string(client_kwargs.get('insecure')) verify = kwargs.get('verify') if verify is None: if insecure: @@ -388,7 +388,7 @@ def get_auth_plugin(endpoint, **kwargs): return auth_plugin -LEGACY_OPTS = ('auth_plugin', 'auth_url', 'token', 'insecure', 'cacert', +LEGACY_OPTS = ('auth_plugin', 'auth_url', 'token', 'insecure', 'cacert', 'tenant_id', 'project_id', 'username', 'password', 'project_name', 'tenant_name', 'user_domain_name', 'user_domain_id', diff --git a/ceilometerclient/tests/unit/test_client.py b/ceilometerclient/tests/unit/test_client.py index e8a1eb5..bfbc355 100644 --- a/ceilometerclient/tests/unit/test_client.py +++ b/ceilometerclient/tests/unit/test_client.py @@ -173,7 +173,7 @@ class ClientTest(utils.BaseTestCase): def test_v2_client_insecure(self): env = FAKE_ENV.copy() env.pop('auth_plugin') - env['insecure'] = 'True' + env['os_insecure'] = 'True' client = self.create_client(env) self.assertIn('insecure', client.auth_plugin.opts) self.assertEqual('True', client.auth_plugin.opts['insecure']) |