From: Dan Prince <dprince@redhat.com>
Date: Fri, 10 Jun 2016 18:14:57 +0000 (-0400)
Subject: Pacemaker: only create DB on pacemaker master
X-Git-Tag: opnfv-6.0.0~738
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b46cebf80a7bcf9833fdfbd23ee2ee7b41c66463;p=apex-puppet-tripleo.git

Pacemaker: only create DB on pacemaker master

This fixes a bug introduced in 72fb6727951af2cf5b16e686b3a36f5f3a7c71c7
where non-master nodes would try to create the database (and potentially
fail due to a race).

Change-Id: Ic0c7b05618b69caca0d4019b5153163f2405bbe5
---

diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index fa00b3e..0bad1b9 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -35,12 +35,12 @@ class tripleo::profile::pacemaker::neutron::server (
   include ::neutron::params
   include ::tripleo::profile::pacemaker::neutron
 
-  if $step >= 2 {
+  $sync_db = ($::hostname == downcase($pacemaker_master))
+  if $step >= 2 and $sync_db {
     include ::neutron::db::mysql
     Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
   }
 
-  $sync_db = ($::hostname == downcase($pacemaker_master))
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
     include ::neutron::server::notifications
     include ::neutron::server