openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Allow neutron_options customization for dashboard 

By default only profile_support can be configured depending of the neutron
mechanism driver used (cisco_n1kv).
This patch allows to add more neutron options to enable lbaas, vpnaas, etc...

Change-Id: I3b3019890a146dd641d6efeb880c5de125d8d132
This commit is contained in:
Dimitri Savineau 2015-12-21 17:00:30 -05:00
parent e8fdaf13de
commit 5e1229c755
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/manifests/overcloud_controller.pp
View File

@ -231,7 +231,7 @@ if hiera('step') >= 4 {
} else {
$_profile_support = 'None'
}
$neutron_options = {'profile_support' => $_profile_support }
$neutron_options = merge({'profile_support' => $_profile_support },hiera('horizon::neutron_options',undef))
$memcached_ipv6 = hiera('memcached_ipv6', false)
if $memcached_ipv6 {

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -441,7 +441,7 @@ MYSQL_HOST=localhost\n",
} else {
$_profile_support = 'None'
}
$neutron_options = {'profile_support' => $_profile_support }
$neutron_options = merge({'profile_support' => $_profile_support },hiera('horizon::neutron_options',undef))
$memcached_ipv6 = hiera('memcached_ipv6', false)
if $memcached_ipv6 {