From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 18 Jul 2016 15:31:12 +0000 (-0400)
Subject: Remove useless mongodb variables in ha manifest
X-Git-Tag: opnfv-6.0.0~1842^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eb8ab6163a0bfca0d3627195d72449bae378006b;p=apex-tripleo-heat-templates.git

Remove useless mongodb variables in ha manifest

Remove useless parameters that move to puppet-tripleo some time ago.

Change-Id: I54e99f2012f0dd12eb9e1cbad5bc73827019934a
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 7b9330d0..39d176ac 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -36,22 +36,6 @@ if $::hostname == downcase(hiera('bootstrap_nodeid')) {
 }
 
 if hiera('step') >= 2 {
-  # NOTE(gfidente): the following vars are needed on all nodes so they
-  # need to stay out of pacemaker_master conditional.
-  # The addresses mangling will hopefully go away when we'll be able to
-  # configure the connection string via hostnames, until then, we need to pass
-  # the list of IPv6 addresses *with* port and without the brackets as 'members'
-  # argument for the 'mongodb_replset' resource.
-  if str2bool(hiera('mongodb::server::ipv6', false)) {
-    $mongo_node_ips_with_port_prefixed = prefix(hiera('mongo_node_ips'), '[')
-    $mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017')
-    $mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017')
-  } else {
-    $mongo_node_ips_with_port = suffix(hiera('mongo_node_ips'), ':27017')
-    $mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017')
-  }
-  $mongodb_replset = hiera('mongodb::server::replset')
-
   if $pacemaker_master {
     class { '::aodh::db::mysql':
         require => Exec['galera-ready'],