openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Pradeep Kilambi 2016-11-23 10:39:08 -05:00
parent 539fc9de07
commit 4e0e4a5cdf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp
View File

@ -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,