x/packstack
Code Issues Proposed changes

Merge "Added neutron options for Horizon"

Browse Source
This commit is contained in:
Jenkins
2014-06-10 20:59:28 +00:00
committed by Gerrit Code Review
parent 266b9b06f4 eb23a191e5
commit 399eece74d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packstack/plugins/dashboard_500.py
View File

@@ -162,6 +162,16 @@ def create_manifest(config, messages):
else:
config["CONFIG_HORIZON_SSL"] = 'false'
if config["CONFIG_LBAAS_INSTALL"] == 'y':
config["CONFIG_HORIZON_NEUTRON_LB"] = 'true'
else:
config["CONFIG_HORIZON_NEUTRON_LB"] = 'false'
if config["CONFIG_NEUTRON_FWAAS"] == 'y':
config["CONFIG_HORIZON_NEUTRON_FW"] = 'true'
else:
config["CONFIG_HORIZON_NEUTRON_FW"] = 'false'
manifestdata = getManifestTemplate("horizon.pp")
appendManifestFile(manifestfile, manifestdata)

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

@@ -19,6 +19,8 @@ class {'horizon':
horizon_cert => '/etc/pki/tls/certs/ssl_ps_server.crt',
horizon_key => '/etc/pki/tls/private/ssl_ps_server.key',
horizon_ca => '/etc/pki/tls/certs/ssl_ps_chain.crt',
neutron_options => { 'enable_lb' => %(CONFIG_HORIZON_NEUTRON_LB)s,
'enable_firewall' => %(CONFIG_HORIZON_NEUTRON_FW)s },
}
if %(CONFIG_HORIZON_SSL)s {