x/anvil
Code Issues Proposed changes

updated to use key params for admin parts

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-07 11:11:20 -08:00
parent a6731ffdbc
commit 942ffca662
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/components/keystone.py
View File

@ -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 +