From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 15 Mar 2016 21:29:59 +0000 (+0000)
Subject: Merge "Install mongodb client package"
X-Git-Tag: opnfv-6.0.0~2090
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b0ba9e8e09d70cb5871a6f343a698e3b481ac297;p=apex-tripleo-heat-templates.git

Merge "Install mongodb client package"
---

b0ba9e8e09d70cb5871a6f343a698e3b481ac297
diff --cc puppet/manifests/overcloud_controller.pp
index 9e5c556a,38676b9d..5556a40c
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@@ -46,19 -44,9 +46,19 @@@ if hiera('step') >= 2 
    # MongoDB
    if downcase(hiera('ceilometer_backend')) == 'mongodb' {
      include ::mongodb::globals
- 
+     include ::mongodb::client
      include ::mongodb::server
 -    $mongo_node_ips_with_port = suffix(hiera('mongo_node_ips'), ':27017')
 +    # 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.
 +    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')
 +    }
      $mongo_node_string = join($mongo_node_ips_with_port, ',')
  
      $mongodb_replset = hiera('mongodb::server::replset')