From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 29 Nov 2016 21:57:20 +0000 (-0500)
Subject: pacemaker: create Mysql_user once Galera is ready (puppet4)
X-Git-Tag: opnfv-6.0.0~465
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f101ee540a450d3509e1c97aab00a97a2ecf8164;p=apex-puppet-tripleo.git

pacemaker: create Mysql_user once Galera is ready (puppet4)

Puppet 4 ordering make things more strict in catalog, which is good.
Resources have to be orchestrated or Puppet will take them in the order
they are found in catalog.

This patch makes sure we create MySQL users only when Galera is actually
ready.

Closes-Bug: #1645787
Change-Id: I536a1a128c3a7eca49bcc4f34a1307bcd60b029e
---

diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index a353e5f..edd09bd 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -146,9 +146,10 @@ class tripleo::profile::pacemaker::database::mysql (
         user       => 'clustercheck@localhost',
       }
 
-      # We create databases for services at step 2 as well. This ensures
+      # We create databases and users for services at step 2 as well. This ensures
       # Galara is up before those get created
       Exec['galera-ready'] -> Mysql_database<||>
+      Exec['galera-ready'] -> Mysql_user<||>
 
     }
     # This step is to create a sysconfig clustercheck file with the root user and empty password