From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Wed, 23 Nov 2016 15:39:08 +0000 (-0500)
Subject: Explicitly set rabbit hosts so its not overridden during upgrade
X-Git-Tag: opnfv-6.0.0~1379^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4e0e4a5cdfd4b7a804399252d42010e6d1f7ac34;p=apex-tripleo-heat-templates.git

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

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,