Make galera-ready exec refreshonly

Previously we were always run the galera-ready exec every step. This
change switches it to be refreshonly so we only wait when the service is
setup or restarted.

Change-Id: I5ff9d49c2590751913b96777bcd72c8a15627a01
Closes-Bug: #1680586

diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index bc5e644..031e80c 100644 (file)
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -120,7 +120,7 @@ class tripleo::profile::pacemaker::database::mysql (
   if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
     tripleo::pacemaker::resource_restart_flag { 'galera-master':
       subscribe => File['mysql-config-file'],
-    }
+    } ~> Exec<| title == 'galera-ready' |>
   }
 
   if $step >= 2 {
@@ -145,7 +145,7 @@ class tripleo::profile::pacemaker::database::mysql (
         },
         require         => [Class['::mysql::server'],
                             Pacemaker::Property['galera-role-node-property']],
-        before          => Exec['galera-ready'],
+        notify          => Exec['galera-ready'],
       }
       exec { 'galera-ready' :
         command     => '/usr/bin/clustercheck >/dev/null',
@@ -153,6 +153,7 @@ class tripleo::profile::pacemaker::database::mysql (
         tries       => 180,
         try_sleep   => 10,
         environment => ['AVAILABLE_WHEN_READONLY=0'],
+        refreshonly => true,
         require     => Exec['create-root-sysconfig-clustercheck'],
       }
       # We add a clustercheck db user and we will switch /etc/sysconfig/clustercheck