x
/
group-based-policy
Code Issues Proposed changes

Merge "Use configured user domain and project domain on Keystone client" into stable/liberty

This commit is contained in:
Jenkins 2017-06-27 18:45:47 +00:00 committed by Gerrit Code Review
parent 81a90fb82f 46258bf4f0
commit 23f29da5a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
View File

@ -328,13 +328,13 @@ class ApicMappingDriver(api.ResourceMappingDriver,
if client:
keystone_authtoken = cfg.CONF.keystone_authtoken
pass_params = (
apic_mapper.APICNameMapper.get_key_password_params(
apic_mapper.APICNameMapper.get_key_password_params_ext(
keystone_authtoken))
admin_auth = keypassword.Password(
auth_url=pass_params[0],
username=pass_params[1], password=pass_params[2],
tenant_name=pass_params[3],
user_domain_id='Default', project_domain_id='Default')
tenant_name=pass_params[3], user_domain_id=pass_params[5],
project_domain_id=pass_params[4])
session = keysession.Session(auth=admin_auth)
ApicMappingDriver.manager = apic_manager.APICManager(
apic_model.ApicDbModel(), logging, network_config, apic_config,