x/packstack
Code Issues Proposed changes

Fixes horizon error when neutron disabled

Browse Source 
When run AIO installation with --os-neutron-install=n
packstack fails because the horizon plugin does not handle
this use case.

Change-Id: I348dda4f887aacb959a12b6c2304775ae7342d62
Fixes: rhbz#1110492
This commit is contained in:
Ivan Chavero
2014-06-17 14:28:16 -06:00
committed by Gael Chamoulaud
parent 673a29a877
commit 7ce1d3f2d4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packstack/plugins/dashboard_500.py
View File

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

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

@@ -1,7 +1,7 @@
$horizon_packages = ["python-memcached", "python-netaddr"]
include concat::setup include concat::setup
$horizon_packages = ["python-memcached", "python-netaddr"]
package {$horizon_packages: package {$horizon_packages:
notify => Class["horizon"], notify => Class["horizon"],
ensure => present, ensure => present,
@@ -64,3 +64,4 @@ if ($::selinux != "false"){
persistent => true, persistent => true,
} }
} }