diff options
| author |   Dimitri Savineau <dsavinea@redhat.com> | 2015-12-21 17:00:30 -0500 |
|---|---|---|
| committer | Dimitri Savineau <dsavinea@redhat.com> | 2016-06-23 14:27:05 +0000 |
| commit | 5e1229c75552df9bd0795a612650a1bc8a9fe8aa (patch) | |
| tree | 6696a77c2aa9e15b0d6e00fd82cfb300a5437c0c /puppet/manifests | |
| parent | e8fdaf13dea1ba84e585f787d1a12b0f24af720e (diff) | |
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
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
2 files changed, 2 insertions, 2 deletions
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 { |