Merge "Pass configured auth strategy to neutronclient"
This commit is contained in:
commit
ed8df80288
|
@ -30,11 +30,11 @@ def _get_client(token=None):
|
|||
'timeout': CONF.neutron_url_timeout,
|
||||
'insecure': CONF.neutron_api_insecure,
|
||||
'ca_cert': CONF.neutron_ca_certificates_file,
|
||||
'auth_strategy': CONF.neutron_auth_strategy,
|
||||
}
|
||||
|
||||
if token:
|
||||
params['token'] = token
|
||||
params['auth_strategy'] = None
|
||||
else:
|
||||
params['username'] = CONF.neutron_admin_username
|
||||
if CONF.neutron_admin_tenant_id:
|
||||
|
@ -43,7 +43,6 @@ def _get_client(token=None):
|
|||
params['tenant_name'] = CONF.neutron_admin_tenant_name
|
||||
params['password'] = CONF.neutron_admin_password
|
||||
params['auth_url'] = CONF.neutron_admin_auth_url
|
||||
params['auth_strategy'] = CONF.neutron_auth_strategy
|
||||
return clientv20.Client(**params)
|
||||
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ class TestNeutronClient(test.TestCase):
|
|||
auth_token='token')
|
||||
self.mox.StubOutWithMock(client.Client, "__init__")
|
||||
client.Client.__init__(
|
||||
auth_strategy=None,
|
||||
auth_strategy=CONF.neutron_auth_strategy,
|
||||
endpoint_url=CONF.neutron_url,
|
||||
token=my_context.auth_token,
|
||||
timeout=CONF.neutron_url_timeout,
|
||||
|
@ -124,7 +124,7 @@ class TestNeutronClient(test.TestCase):
|
|||
is_admin=True)
|
||||
self.mox.StubOutWithMock(client.Client, "__init__")
|
||||
client.Client.__init__(
|
||||
auth_strategy=None,
|
||||
auth_strategy=CONF.neutron_auth_strategy,
|
||||
endpoint_url=CONF.neutron_url,
|
||||
token=my_context.auth_token,
|
||||
timeout=CONF.neutron_url_timeout,
|
||||
|
|
Loading…
Reference in New Issue