More redux adjustments and policy json fixes.
This commit is contained in:
parent
648520f53e
commit
02a5e33ead
@ -14,10 +14,10 @@ function get_id () {
|
||||
}
|
||||
|
||||
# Added! (NOT IN ORIGINAL)
|
||||
ADMIN_USERNAME=%ADMIN_USERNAME%
|
||||
ADMIN_USERNAME=%ADMIN_USER_NAME%
|
||||
ADMIN_PASSWORD=%ADMIN_PASSWORD%
|
||||
DEMO_USER_NAME=%DEMO_USER_NAME%
|
||||
INVIS_USER_NAME=invisible_to_admin
|
||||
INVIS_USER_NAME=%INVIS_USER_NAME%
|
||||
MEMBER_ROLE_NAME=Member
|
||||
KEYSTONE_ADMIN_ROLE_NAME=KeystoneAdmin
|
||||
KEYSTONE_SERVICE_ADMIN_ROLE_NAME=KeystoneServiceAdmin
|
||||
|
@ -43,6 +43,7 @@ API_PASTE_CONF = 'glance-api-paste.ini'
|
||||
REG_PASTE_CONF = 'glance-registry-paste.ini'
|
||||
POLICY_JSON = 'policy.json'
|
||||
CONFIGS = [API_CONF, REG_CONF, API_PASTE_CONF, REG_PASTE_CONF, POLICY_JSON]
|
||||
ADJUST_CONFIGS = [API_CONF, REG_CONF, API_PASTE_CONF, REG_PASTE_CONF]
|
||||
CFG_SECTION = 'DEFAULT'
|
||||
|
||||
#reg, api are here as possible subcomponents
|
||||
@ -141,7 +142,7 @@ class GlanceInstaller(comp.PythonInstallComponent):
|
||||
return comp.PythonInstallComponent._get_source_config(self, config_fn)
|
||||
|
||||
def _config_adjust(self, contents, name):
|
||||
if name not in CONFIGS:
|
||||
if name not in ADJUST_CONFIGS:
|
||||
return contents
|
||||
#use config parser and
|
||||
#then extract known configs that
|
||||
|
@ -50,6 +50,7 @@ MANAGE_DATA_CONF = 'keystone_init.sh'
|
||||
MANAGE_CMD_ROOT = [sh.joinpths("/", "bin", 'bash')]
|
||||
MANAGE_ADMIN_USER = 'admin'
|
||||
MANAGE_DEMO_USER = 'demo'
|
||||
MANAGER_INVIS_USER = 'invisible_to_admin'
|
||||
|
||||
#sync db command
|
||||
SYNC_DB_CMD = [sh.joinpths('%BINDIR%', 'keystone-manage'), 'db_sync']
|
||||
@ -181,8 +182,9 @@ class KeystoneInstaller(comp.PythonInstallComponent):
|
||||
mp.update(get_shared_params(self.cfg))
|
||||
elif config_fn == MANAGE_DATA_CONF:
|
||||
mp['ADMIN_PASSWORD'] = self.cfg.get('passwords', 'horizon_keystone_admin')
|
||||
mp['ADMIN_USERNAME'] = MANAGE_ADMIN_USER
|
||||
mp['ADMIN_USER_NAME'] = MANAGE_ADMIN_USER
|
||||
mp['DEMO_USER_NAME'] = MANAGE_DEMO_USER
|
||||
mp['INVIS_USER_NAME'] = MANAGER_INVIS_USER
|
||||
mp.update(get_shared_params(self.cfg))
|
||||
return mp
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user