aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 20:02:06 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 20:02:06 +0000
commitd59a05ae38aad38bdd2424673d1a536045793acd (patch)
treecb552727bde106512464454ab1feb1539f076e2e /manifests/profile
parente2fe8ce79906c105e793752df8f32560fbce602c (diff)
parenta8669bade4c24204cf8c99e6436689ef5cd386ab (diff)
Merge "Include gnocchi config on non-bootstrap nodes"
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/pacemaker/gnocchi.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp
index 98d1b36..edc1728 100644
--- 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 {