diff options
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 72c31a31..5213826c 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -200,7 +200,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 { |