x/packstack
Code Issues Proposed changes

Merge pull request #34 from derekhiggins/master

Browse Source 
horizon changes
This commit is contained in:
Derek Higgins
2012-12-18 17:53:07 -08:00
parent c849ef7769 c2c95d67b8
commit e13d229a38
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/installer/output_messages.py
View File

@@ -81,4 +81,5 @@ ERR_NO_ANSWER_FILE="Error: Could not find file %s"
ERR_ONLY_1_FLAG="Error: The %s flag is mutually exclusive to all other command line options"
#
INFO_KEYSTONERC="To use the command line tools source the file /root/keystonerc_admin created on the OSCLIENT host (if configured)"
INFO_KEYSTONERC="To use the command line tools source the file /root/keystonerc_admin created on %s"
INFO_DASHBOARD="To use the console, browse to http://%s/dashboard"

1
packstack/installer/run_setup.py
View File

@@ -604,7 +604,6 @@ def _addFinalInfoMsg():
successfull install of rhemv
"""
controller.MESSAGES.append(output_messages.INFO_LOG_FILE_PATH%(logFile))
controller.MESSAGES.append(output_messages.INFO_KEYSTONERC)
def _lockRpmVersion():
"""

3
packstack/plugins/dashboard_500.py
View File

@@ -7,7 +7,7 @@ import uuid
import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs
from packstack.installer import basedefs, output_messages
import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
@@ -78,3 +78,4 @@ def createmanifest():
manifestfile = "%s_horizon.pp"%controller.CONF['CONFIG_HORIZON_HOST']
manifestdata = getManifestTemplate("horizon.pp")
appendManifestFile(manifestfile, manifestdata)
controller.MESSAGES.append(output_messages.INFO_DASHBOARD%controller.CONF['CONFIG_HORIZON_HOST'])

3
packstack/plugins/openstack_client_400.py
View File

@@ -6,7 +6,7 @@ import logging
import packstack.installer.engine_validators as validate
import packstack.installer.engine_processors as process
from packstack.installer import basedefs
from packstack.installer import basedefs, output_messages
import packstack.installer.common_utils as utils
from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
@@ -65,3 +65,4 @@ def createmanifest():
manifestfile = "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST']
manifestdata = getManifestTemplate("openstack_client.pp")
appendManifestFile(manifestfile, manifestdata)
controller.MESSAGES.append(output_messages.INFO_KEYSTONERC%controller.CONF['CONFIG_OSCLIENT_HOST'])

6
packstack/puppet/templates/horizon.pp
View File

@@ -4,6 +4,12 @@ package {"horizon-packages":
notify => Class["horizon"],
}
file {"/etc/httpd/conf.d/rootredirect.conf":
ensure => present,
content => 'RedirectMatch ^/$ /dashboard/',
notify => File["/etc/httpd/conf.d/openstack-dashboard.conf"],
}
class {'horizon':
secret_key => '%(CONFIG_HORIZON_SECRET_KEY)s',
keystone_host => '%(CONFIG_KEYSTONE_HOST)s',