x/anvil
Code Issues Proposed changes

Fix for issue 166. Use keystone.conf.sample as the source

Browse Source 
when generating keystone.conf
This commit is contained in:
Ken Thomas 2012-04-11 10:42:59 -07:00
parent 524d2a736d
commit da16e3340c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/components/keystone.py
View File

@ -36,6 +36,7 @@ BIN_DIR = "bin"
# Simple confs # Simple confs
ROOT_CONF = "keystone.conf" ROOT_CONF = "keystone.conf"
ROOT_SOURCE_FN = "keystone.conf.sample"
CATALOG_CONF = 'default_catalog.templates' CATALOG_CONF = 'default_catalog.templates'
LOGGING_CONF = "logging.conf" LOGGING_CONF = "logging.conf"
LOGGING_SOURCE_FN = 'logging.conf.sample' LOGGING_SOURCE_FN = 'logging.conf.sample'
@ -143,6 +144,8 @@ class KeystoneInstaller(comp.PythonInstallComponent):
real_fn = config_fn real_fn = config_fn
if config_fn == LOGGING_CONF: if config_fn == LOGGING_CONF:
real_fn = LOGGING_SOURCE_FN real_fn = LOGGING_SOURCE_FN
elif config_fn == ROOT_CONF:
real_fn = ROOT_SOURCE_FN
fn = sh.joinpths(self.app_dir, 'etc', real_fn) fn = sh.joinpths(self.app_dir, 'etc', real_fn)
return (fn, sh.load_file(fn)) return (fn, sh.load_file(fn))