From 942ffca6625af1db3f47f8c51715dbe774e769f7 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 7 Mar 2012 11:11:20 -0800 Subject: [PATCH] updated to use key params for admin parts --- devstack/components/keystone.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/devstack/components/keystone.py b/devstack/components/keystone.py index ca673e02..546bbbac 100644 --- a/devstack/components/keystone.py +++ b/devstack/components/keystone.py @@ -74,9 +74,6 @@ REQ_PIPS = ['general.json', 'keystone.json'] #used to wait until started before we can run the data setup script WAIT_ONLINE_TO = settings.WAIT_ALIVE_SECS -#config keys we warm up so u won't be prompted later -WARMUP_PWS = ['horizon_keystone_admin', 'service_token'] - #swift template additions SWIFT_TEMPL_ADDS = ['catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s', 'catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s', @@ -196,8 +193,7 @@ class KeystoneInstaller(comp.PythonInstallComponent): return comp.PythonInstallComponent._get_source_config(self, config_fn) def warm_configs(self): - for pw_key in WARMUP_PWS: - self.cfg.get("passwords", pw_key) + get_shared_params(self.cfg) def _get_param_map(self, config_fn): #these be used to fill in the configuration/cmds +