diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-24 09:23:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-24 09:23:59 +0000 |
| commit | 43b7712bd86764bf5d634d1ff0f2b5f05d55a413 (patch) | |
| tree | 535ab4c861216416bef12d5bae9e9f29a13dc216 /extraconfig | |
| parent | 9c28b0f819171fe67792917db39fed4db11460d9 (diff) | |
| parent | 4e0e4a5cdfd4b7a804399252d42010e6d1f7ac34 (diff) | |
Merge "Explicitly set rabbit hosts so its not overridden during upgrade"
Diffstat (limited to 'extraconfig')
| -rw-r--r-- | extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp b/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp index 1c376285..a8d43663 100644 --- a/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp +++ b/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp @@ -48,7 +48,13 @@ $mongodb_replset = hiera('mongodb::server::replset') $mongo_node_string = join($mongo_node_ips_with_port, ',') $database_connection = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}" -include ::ceilometer +$rabbit_hosts = hiera('rabbitmq_node_ips', undef) +$rabbit_port = hiera('ceilometer::rabbit_port', 5672) +$rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}") + +class { '::ceilometer' : + rabbit_hosts => $rabbit_endpoints, +} class {'::ceilometer::db': database_connection => $database_connection, |