From 5e1229c75552df9bd0795a612650a1bc8a9fe8aa Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 21 Dec 2015 17:00:30 -0500 Subject: 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 --- puppet/manifests/overcloud_controller.pp | 2 +- puppet/manifests/overcloud_controller_pacemaker.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/manifests') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 63c59826..7f055c1e 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -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 { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 835d5689..d9aaff33 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -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 { -- cgit 1.2.3-korg