From 91597fc56983ee20d77985e97ad7563fcd30f1bc Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 28 Nov 2016 08:34:20 +0200
Subject: Use FQDNs for the services' RabbitMQ configuration

This replaces the services' IP-based RabbitMQ configuration and uses
FQDNs instead.

Change-Id: I2be81aecacf50839a029533247981f5edf59cb7f
---
 manifests/profile/base/heat.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'manifests/profile/base/heat.pp')

diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 00a9809..c743ce0 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -36,8 +36,8 @@
 #   Defaults to hiera('step')
 #
 # [*rabbit_hosts*]
-#   list of the rabbbit host IPs
-#   Defaults to hiera('rabbitmq_node_ips')
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
 #
 # [*rabbit_port*]
 #   IP port for rabbitmq service
@@ -48,7 +48,7 @@ class tripleo::profile::base::heat (
   $manage_db_purge     = hiera('heat_enable_db_purge', true),
   $notification_driver = 'messaging',
   $step                = hiera('step'),
-  $rabbit_hosts        = hiera('rabbitmq_node_ips', undef),
+  $rabbit_hosts        = hiera('rabbitmq_node_names', undef),
   $rabbit_port         = hiera('heat::rabbit_port', 5672),
 ) {
   # Domain resources will be created at step5 on the node running keystone.pp
@@ -62,7 +62,7 @@ class tripleo::profile::base::heat (
   }
 
   if $step >= 4 {
-    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::heat' :
       notification_driver => $notification_driver,
       rabbit_hosts        => $rabbit_endpoints,
-- 
cgit 1.2.3-korg