From: Carlos Camacho <ccamacho@redhat.com>
Date: Mon, 11 Jul 2016 11:02:19 +0000 (+0200)
Subject: Move gnocchi clustercheck to step 2
X-Git-Tag: opnfv-6.0.0~688^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2c74f1d3655dee5b4e62fa6f4d31fc0e2b28ee5f;p=apex-puppet-tripleo.git

Move gnocchi clustercheck to step 2

As not having guarantee of being installed on same node, the dbsync
will be on step 3 and the clustercheck on 2.

Change-Id: Id728aae79442c45ab48fe0914c065f1807e8890d
---

diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp
index ad566b1..a6d472c 100644
--- a/manifests/profile/pacemaker/gnocchi.pp
+++ b/manifests/profile/pacemaker/gnocchi.pp
@@ -56,15 +56,18 @@ class tripleo::profile::pacemaker::gnocchi (
     $pacemaker_master = false
   }
 
-  if $step >= 3 and $sync_db {
-    include ::gnocchi
-    include ::gnocchi::config
-    include ::gnocchi::client
+  if $step >= 2 and $pacemaker_master {
     if $gnocchi_indexer_backend == 'mysql' {
       class { '::gnocchi::db::mysql':
         require => Exec['galera-ready'],
       }
     }
+  }
+
+  if $step >= 3 and $sync_db {
+    include ::gnocchi
+    include ::gnocchi::config
+    include ::gnocchi::client
     include ::gnocchi::db::sync
   }