diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-01 14:30:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-01 14:30:04 +0000 |
| commit | 915fc62398d2311b7e43dfd564dccb8a400b21f8 (patch) | |
| tree | 9a60b6e8d5f66edec7922e63b53493af1648e7a8 /manifests | |
| parent | 16c76992bc29eebe039de467bbc046827e8fb134 (diff) | |
| parent | 960ba650670794f0309b1f2e8c4d3707c9ca32e5 (diff) | |
Merge "Update ceilometer collector ipv6 handling"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/ceilometer/collector.pp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index 3c0a361..20eab54 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -68,19 +68,8 @@ class tripleo::profile::base::ceilometer::collector ( if !$mongodb_replset { fail('mongodb_replset is required when using mongodb') } - # 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($mongodb_ipv6) { - $mongo_node_ips_with_port_prefixed = prefix($mongodb_node_ips, '[') - $mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017') - $mongo_node_ips_with_port_nobr = suffix($mongodb_node_ips, ':27017') - } else { - $mongo_node_ips_with_port = suffix($mongodb_node_ips, ':27017') - $mongo_node_ips_with_port_nobr = suffix($mongodb_node_ips, ':27017') - } - $mongo_node_string = join($mongo_node_ips_with_port, ',') - + $mongo_nodes = suffix(any2array(normalize_ip_for_uri($mongodb_node_ips)), ':27017') + $mongo_node_string = join($mongo_nodes, ',') $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}" class { '::ceilometer::db' : |