From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 16 Apr 2015 08:23:28 +0000 (+0000)
Subject: Merge "Do not downcase IP addresses"
X-Git-Tag: opnfv-6.0.0~2615
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f0b6501ae45491a7492e8590df3427fc32596222;p=apex-tripleo-heat-templates.git

Merge "Do not downcase IP addresses"
---

f0b6501ae45491a7492e8590df3427fc32596222
diff --cc puppet/manifests/overcloud_controller.pp
index aa053bd8,f26d82a1..a6518c00
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@@ -59,15 -42,15 +59,15 @@@ if hiera('step') >= 2 
    # MongoDB
    include ::mongodb::globals
    include ::mongodb::server
-   $mongo_node_ips = split(downcase(hiera('mongo_node_ips')), ',')
+   $mongo_node_ips = split(hiera('mongo_node_ips'), ',')
    $mongo_node_ips_with_port = suffix($mongo_node_ips, ':27017')
 +  $mongo_node_string = join($mongo_node_ips_with_port, ',')
  
 -  if count($mongo_node_ips) > 1 {
 -    if downcase($::hostname) == hiera('bootstrap_nodeid') {
 -      $mongodb_replset = hiera('mongodb::server::replset')
 -      mongodb_replset { $mongodb_replset :
 -        members => $mongo_node_ips_with_port,
 -      }
 +  $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,
      }
    }