openstack/charm-keystone
Code Issues Proposed changes

Ensure configured admin-token is used if provided

Browse Source
This commit is contained in:
James Page 2014-03-28 11:34:38 +00:00
parent 1e7d06b86e
commit 9d3cbaf54d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/keystone_context.py
View File

@ -96,7 +96,7 @@ class KeystoneContext(context.OSContextGenerator):
def __call__(self):
from keystone_utils import api_port, set_admin_token
ctxt = {}
ctxt['token'] = set_admin_token()
ctxt['token'] = set_admin_token(config('admin-token'))
ctxt['admin_port'] = determine_api_port(api_port('keystone-admin'))
ctxt['public_port'] = determine_api_port(api_port('keystone-public'))
ctxt['debug'] = config('debug') in ['yes', 'true', 'True']