Merge "Restore the NtpServer parameter name"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller.pp

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 72c31a3..985b3f0 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -18,14 +18,6 @@ include ::tripleo::firewall
 
 $enable_load_balancer = hiera('enable_load_balancer', true)
 
-if hiera('step') >= 1 {
-
-  create_resources(kmod::load, hiera('kernel_modules'), {})
-  create_resources(sysctl::value, hiera('sysctl_settings'), {})
-  Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
-
-}
-
 if hiera('step') >= 2 {
 
   # MongoDB
@@ -200,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 {