From 9d3cbaf54dd88f22a22e08e1ca3d15e2dcc23295 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 28 Mar 2014 11:34:38 +0000 Subject: [PATCH] Ensure configured admin-token is used if provided --- hooks/keystone_context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/keystone_context.py b/hooks/keystone_context.py index 3badbe78..d067af8b 100644 --- a/hooks/keystone_context.py +++ b/hooks/keystone_context.py @@ -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']