x
/
packstack
Code Issues Proposed changes

Enable VPN tab in Horizon when enabling VPNaaS 

Previously, setting CONFIG_NEUTRON_VPNAAS=y did not enable the VPN
tab in the Horizon interface. We need to set it explicitly.

Change-Id: Ie2a1f6e413e3ab541b259f1b847799bac651cef0
Fixes: bz#1297733
This commit is contained in:
Javier Pena 2016-01-19 14:04:30 +01:00
parent 86a49a16e4
commit c18c2b57d3
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/plugins/dashboard_500.py
View File

@ -197,12 +197,15 @@ def create_manifest(config, messages):
config["CONFIG_HORIZON_NEUTRON_LB"] = False
config["CONFIG_HORIZON_NEUTRON_FW"] = False
config["CONFIG_HORIZON_NEUTRON_VPN"] = False
if config['CONFIG_NEUTRON_INSTALL'] == 'y':
if config["CONFIG_LBAAS_INSTALL"] == 'y':
config["CONFIG_HORIZON_NEUTRON_LB"] = True
if config["CONFIG_NEUTRON_FWAAS"] == 'y':
config["CONFIG_HORIZON_NEUTRON_FW"] = True
if config["CONFIG_NEUTRON_VPNAAS"] == 'y':
config["CONFIG_HORIZON_NEUTRON_VPN"] = True
manifestdata = getManifestTemplate("horizon")
appendManifestFile(manifestfile, manifestdata)

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

@ -41,6 +41,7 @@ class {'::horizon':
neutron_options => {
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
'enable_vpn' => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
},
}