From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 17 Aug 2016 11:04:47 +0000 (+0200)
Subject: Configure galera-monitor on all controller nodes
X-Git-Tag: opnfv-6.0.0~627^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2cbbe14a76f228c3110542f3936417270f61eefe;p=apex-puppet-tripleo.git

Configure galera-monitor on all controller nodes

When we implemented the galera composable role we accidentally moved the
xinetd.d monitor service on the bootstrap node only. This meant that
haproxy believed that galera was down on the non-bootstrap nodes. A
shutdown of the bootstrap node meant that galera was effectively down
because haproxy would refuse to redirect the traffic to the
non-bootstrap node. Fix this by creating the
/etc/xinetd.d/galera-monitor on all controller nodes.

Change-Id: Ib5a06b3abbc32182476c2b0c81eb77a12821ad6b
---

diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 529aeac..31d7d80 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -71,7 +71,7 @@ class tripleo::profile::pacemaker::database::mysql (
     mysql_server_options    => $mysqld_options,
   }
 
-  if $step >= 2 and $pacemaker_master {
+  if $step >= 2 {
     if $pacemaker_master {
       pacemaker::resource::ocf { 'galera' :
         ocf_agent_name  => 'heartbeat:galera',