x/packstack
Code Issues Proposed changes

Only print warning about cert if it was generated

Browse Source 
Change-Id: I1234072ac79dc4da58f24fb9fa2985df46072986
This commit is contained in:
Derek Higgins
2013-03-21 11:48:46 -04:00
parent afa3ffb048
commit ff7a6e32bd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/plugins/dashboard_500.py
View File

@@ -119,11 +119,6 @@ def createmanifest():
sslmanifestdata = ''
if controller.CONF["CONFIG_HORIZON_SSL"] == 'y':
controller.CONF["CONFIG_HORIZON_PORT"] = "'443'"
controller.MESSAGES.append(
"%sNOTE%s : A certificate was generated to be used for ssl, "
"You should change the ssl certificate configured in "
"/etc/httpd/conf.d/ssl.conf on %s to use a CA signed cert."
% (basedefs.RED, basedefs.NO_COLOR, horizon_host))
proto = "https"
sslmanifestdata += getManifestTemplate("https.pp")
@@ -145,6 +140,12 @@ def createmanifest():
controller.addResource(
horizon_host, ssl_key, 'ssl_ps_server.key'
)
else:
controller.MESSAGES.append(
"%sNOTE%s : A certificate was generated to be used for ssl, "
"You should change the ssl certificate configured in "
"/etc/httpd/conf.d/ssl.conf on %s to use a CA signed cert."
% (basedefs.RED, basedefs.NO_COLOR, horizon_host))
manifestdata = getManifestTemplate("horizon.pp")
manifestdata += sslmanifestdata