From: James Slagle <jslagle@redhat.com>
Date: Wed, 20 Jul 2016 00:08:08 +0000 (-0400)
Subject: Only sync the gnocchi db on the pacemaker master
X-Git-Tag: opnfv-6.0.0~679
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=88ac50880e208cc0b6fca16f0b325b4a0c86a3dd;p=apex-puppet-tripleo.git

Only sync the gnocchi db on the pacemaker master

The gnocchi db sync is being run from multiple controllers causing errors in
CI. See the bug for more details.

Change-Id: I67a15dc83a754fb6f5fe25c64ae9e7d29c58fcec
Closes-Bug: #1604624
---

diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp
index a6d472c..98d1b36 100644
--- a/manifests/profile/pacemaker/gnocchi.pp
+++ b/manifests/profile/pacemaker/gnocchi.pp
@@ -31,16 +31,11 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to undef
-#
 
 class tripleo::profile::pacemaker::gnocchi (
   $gnocchi_indexer_backend = downcase(hiera('gnocchi_indexer_backend', 'mysql')),
   $bootstrap_node  = hiera('bootstrap_nodeid'),
   $step            = hiera('step'),
-  $sync_db         = true,
 ) {
 
   Service <| tag == 'gnocchi-service' |> {
@@ -64,7 +59,7 @@ class tripleo::profile::pacemaker::gnocchi (
     }
   }
 
-  if $step >= 3 and $sync_db {
+  if $step >= 3 and $pacemaker_master {
     include ::gnocchi
     include ::gnocchi::config
     include ::gnocchi::client