openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Update ceilometer collector ipv6 handling"

This commit is contained in:
Jenkins 2016-12-01 14:30:04 +00:00 committed by Gerrit Code Review
parent 16c76992bc 960ba65067
commit 915fc62398
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/profile/base/ceilometer/collector.pp
View File

@ -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' :