Include gnocchi config on non-bootstrap nodes

Change I67a15dc83a754fb6f5fe25c64ae9e7d29c58fcec removed the
gnocchi configuration completely from non-bootstrap nodes.  This
changes it so the configuration is included on all nodes, but the
db sync is only included on bootstrap.

Change-Id: If402becc900c175f5b3bb95c3413276e5a04b4f7
Closes-Bug: 1604708

diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp
index 98d1b36..edc1728 100644 (file)
--- a/manifests/profile/pacemaker/gnocchi.pp
+++ b/manifests/profile/pacemaker/gnocchi.pp
@@ -59,11 +59,13 @@ class tripleo::profile::pacemaker::gnocchi (
     }
   }
 
-  if $step >= 3 and $pacemaker_master {
+  if $step >= 3 {
     include ::gnocchi
     include ::gnocchi::config
     include ::gnocchi::client
-    include ::gnocchi::db::sync
+    if $pacemaker_master {
+      include ::gnocchi::db::sync
+    }
   }
 
   if $step >= 5 and $pacemaker_master {