From d95efa180d94fc5ef8ee3710ec4f48799ade721f Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Wed, 11 Oct 2017 16:37:16 +0200
Subject: [PATCH] Use transport_url for Heat

Removes hiera of deprecated rabbit settings for Heat and use
transport_url instead.

Change-Id: I31f92bdb4ff332c24356494695bf1cd273f1a538
---
 .../puppet-stack-config/puppet-stack-config.yaml.template     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 13cbb52dd..a0b6ad96e 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -144,9 +144,7 @@ heat::engine::convergence_engine: true
 #heat::engine::num_engine_workers:
 heat::engine::max_nested_stack_depth: 7
 heat::instance_user: heat-admin
-heat::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
-heat::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
-heat::rabbit_host: "{{LOCAL_IP_WRAPPED}}"
+heat::default_transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP_WRAPPED}}//"
 heat::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
 heat::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
 heat::keystone::authtoken::password: {{UNDERCLOUD_HEAT_PASSWORD}}