Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker

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

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 7f18029..6060ad7 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -38,6 +38,7 @@ if hiera('step') >= 1 {
     controller_hosts       => $controller_node_ips,
     controller_hosts_names => $controller_node_names,
     manage_vip             => false,
+    haproxy_service_manage => false,
   }
 
   $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G')
@@ -311,10 +312,11 @@ MYSQL_HOST=localhost\n",
     replace => true,
   } ->
   class { '::rabbitmq':
-    service_manage        => false,
-    environment_variables => {
-      'RABBITMQ_NODENAME' => "rabbit@$::hostname",
-    },
+    service_manage          => false,
+    tcp_keepalive           => false,
+    config_kernel_variables => hiera('rabbitmq_kernel_variables'),
+    config_variables        => hiera('rabbitmq_config_variables'),
+    environment_variables   => hiera('rabbitmq_environment'),
   }
   if $pacemaker_master {
     pacemaker::resource::ocf { 'rabbitmq':