diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-11-23 10:39:08 -0500 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2016-11-23 10:49:54 -0500 |
| commit | 4e0e4a5cdfd4b7a804399252d42010e6d1f7ac34 (patch) | |
| tree | d5dc9747c5425898e98b569026e1552c1ae279e2 | |
| parent | 539fc9de07e83fa5b456e8199115adbcbe4f3bc8 (diff) | |
Explicitly set rabbit hosts so its not overridden during upgrade
During ceilometer pre upgrade, rabbit host config gets overridden in
ceilometer conf as its setting to defaults. This explicitly sets the
host info in standalone manifest.
Closes-Bug: #1644278
Change-Id: I862ea7165c5d42ba1f9a19111a8be8934c0ef883
| -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, |