openstack
/
mistral
Code Issues Proposed changes

Merge "Fix cron keystone calls when token is available"

This commit is contained in:
Jenkins 2017-08-21 04:12:05 +00:00 committed by Gerrit Code Review
parent e379caf45c d08479ff0c
commit 1a8837b9d2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mistral/utils/openstack/keystone.py
View File

@ -96,11 +96,17 @@ def get_session_and_auth(context, **kwargs):
def _admin_client(trust_id=None):
if CONF.keystone_authtoken.auth_type is None:
auth_url = CONF.keystone_authtoken.auth_uri
project_name = CONF.keystone_authtoken.admin_tenant_name
# You can't use trust and project together
if trust_id:
project_name = None
cl = ks_client.Client(
username=CONF.keystone_authtoken.admin_user,
password=CONF.keystone_authtoken.admin_password,
project_name=CONF.keystone_authtoken.admin_tenant_name,
project_name=project_name,
auth_url=auth_url,
trust_id=trust_id
)