x/anvil
Code Issues Proposed changes

Updated with user message only being in param map section.

Browse Source
This commit is contained in:
Joshua Harlow
2012-01-25 14:44:57 -08:00
parent bc4e27ad8f
commit c1205e1b74
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/components/horizon.py
View File

@@ -143,8 +143,6 @@ class HorizonInstaller(comp.PythonInstallComponent):
user = self.cfg.get('horizon', 'apache_user')
if not user:
user = sh.getuser()
if user in BAD_APACHE_USERS:
LOG.warn("You may want to adjust your configuration, user=%s will typically not work with apache", user)
group = self.cfg.get('horizon', 'apache_group')
if not group:
group = sh.getgroupname()
@@ -156,6 +154,8 @@ class HorizonInstaller(comp.PythonInstallComponent):
mp = dict()
if config_fn == HORIZON_APACHE_CONF:
(user, group) = self._get_apache_user_group()
if user in BAD_APACHE_USERS:
LOG.warn("You may want to adjust your configuration, user=%s,group=%s will typically not work with apache", user, group)
mp['USER'] = user
mp['GROUP'] = group
mp['HORIZON_DIR'] = self.appdir