summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-01 20:35:53 +0000
committerGerrit Code Review <review@openstack.org>2015-11-01 20:35:53 +0000
commit11299a06e611b11623b801dd6e24dab82d4b3a4e (patch)
treecb32f2016644dec4a9a752dd4d04e696e6088d7d
parent20618a0d5d05d3c868b817a074be323ffa2e345e (diff)
parent4ae04265ffc015259a2c3709b03edcfe86953833 (diff)
downloados-client-config-11299a06e611b11623b801dd6e24dab82d4b3a4e.tar.gz
Merge "Allow for templated variables in auth_url"
-rw-r--r--os_client_config/config.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py
index aa161e4..483b214 100644
--- a/os_client_config/config.py
+++ b/os_client_config/config.py
@@ -627,6 +627,13 @@ class OpenStackConfig(object):
if type(config[key]) is not bool:
config[key] = get_boolean(config[key])
+ # TODO(mordred): Special casing auth_url here. We should
+ # come back to this betterer later so that it's
+ # more generalized
+ if 'auth' in config and 'auth_url' in config['auth']:
+ config['auth']['auth_url'] = config['auth']['auth_url'].format(
+ **config)
+
# NOTE(dtroyer): OSC needs a hook into the auth args before the
# plugin is loaded in order to maintain backward-
# compatible behaviour