X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller.pp;h=985b3f0197cd7b23342fc8cc54fd5342d4edd53a;hb=e75563319fa2984256ff569a6eb2e4e980d80f4f;hp=357e9bfeb54a4f964b10694d15664357f6223231;hpb=631b30dd3a49bd4374b828ed8bdfa9747c9b6d0c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 357e9bfe..985b3f01 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -192,7 +192,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 {