summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-26 20:38:48 +0000
committerGerrit Code Review <review@openstack.org>2015-05-26 20:38:48 +0000
commit8bdb82deb9423d1f7de2b479f97f92fb66ab3c81 (patch)
tree717f0ada8032c6b73a973a51b445adf7f6c5886d
parent3a7b3fe00dc2c944e77e2e25a3b37614425fc5cf (diff)
parentc4a822668199ca52fdaec28b0ba16c2fe417e4b4 (diff)
Merge "Ensures mongodb configuration only happens if mongodb is needed"
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp16
1 files changed, 8 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index fa26c11b..ba9b74f0 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -94,14 +94,14 @@ if hiera('step') >= 1 {
replace => true,
}
- # MongoDB
- include ::mongodb::globals
-
- # FIXME: replace with service_manage => false on ::mongodb::server
- # when this is merged: https://github.com/puppetlabs/pupp etlabs-mongodb/pull/198
- class { '::mongodb::server' :
- service_ensure => undef,
- service_enable => false,
+ if downcase(hiera('ceilometer_backend')) == 'mongodb' {
+ include ::mongodb::globals
+ # FIXME: replace with service_manage => false on ::mongodb::server
+ # when this is merged: https://github.com/puppetlabs/pupp etlabs-mongodb/pull/198
+ class { '::mongodb::server' :
+ service_ensure => undef,
+ service_enable => false,
+ }
}
# Galera