aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-14 08:00:00 +0000
committerGerrit Code Review <review@openstack.org>2016-06-14 08:00:00 +0000
commit747e3b29fea38371d53b167ecad812d1701890f4 (patch)
tree10da6d13556a96c3aae1c6e198539946ed79ca3a /puppet/manifests/overcloud_controller.pp
parente1238aa903f088f49699cd4c1e10a55655e08ab5 (diff)
parent11074fb08f5bb86b1b84065ec1bfada3ad387053 (diff)
Merge "Composable roles within services - MongoDB"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index ba0ad5c9..c6a80661 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -36,9 +36,6 @@ if hiera('step') >= 2 {
# MongoDB
if downcase(hiera('ceilometer_backend')) == 'mongodb' {
- include ::mongodb::globals
- include ::mongodb::client
- include ::mongodb::server
# NOTE(gfidente): We need to pass the list of IPv6 addresses *with* port and
# without the brackets as 'members' argument for the 'mongodb_replset'
# resource.
@@ -54,11 +51,6 @@ if hiera('step') >= 2 {
$mongodb_replset = hiera('mongodb::server::replset')
$ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
- if downcase(hiera('bootstrap_nodeid')) == $::hostname {
- mongodb_replset { $mongodb_replset :
- members => $mongo_node_ips_with_port_nobr,
- }
- }
}
if str2bool(hiera('enable_galera', true)) {