openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Ensures mongodb configuration only happens if mongodb is needed"

This commit is contained in:
Jenkins 2015-05-26 20:38:48 +00:00 committed by Gerrit Code Review
parent 3a7b3fe00d c4a8226681
commit 8bdb82deb9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -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