From 90477ae87d084dc1dfbc94d4b20776611797ea38 Mon Sep 17 00:00:00 2001
From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Fri, 20 May 2016 17:38:32 +0300
Subject: [PATCH] Add support for clients_heat/url option

This option is used for connection between Heat
and other OpenStack services.

Change-Id: I7ec1fcfaeb29634a1246e17b0d41b63d1d505fda
---
 manifests/init.pp              | 6 ++++++
 spec/classes/heat_init_spec.rb | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index fec72495..9d5556db 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -299,6 +299,10 @@
 #   HTTPProxyToWSGI middleware.
 #   Defaults to $::os_service_default.
 #
+# [*heat_clients_url*]
+#   (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
+#   Defaults to $::os_service_default.
+#
 # DEPRECATED PARAMETERS
 #
 # [*verbose*]
@@ -375,6 +379,7 @@ class heat(
   $max_json_body_size                 = $::os_service_default,
   $notification_driver                = $::os_service_default,
   $enable_proxy_headers_parsing       = $::os_service_default,
+  $heat_clients_url                   = $::os_service_default,
   # Deprecated
   $verbose                            = undef,
 ) {
@@ -475,6 +480,7 @@ class heat(
     'trustee/user_domain_id':    value => $keystone_user_domain_id;
 
     'clients_keystone/auth_uri': value => $identity_uri;
+    'clients_heat/url':          value => $heat_clients_url;
   }
 
   if (!is_service_default($enable_stack_adopt)) {
diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb
index f1340621..9f660eb7 100644
--- a/spec/classes/heat_init_spec.rb
+++ b/spec/classes/heat_init_spec.rb
@@ -18,6 +18,7 @@ describe 'heat' do
       :keystone_ec2_uri      => 'http://127.0.0.1:5000/v2.0/ec2tokens',
       :flavor                => 'keystone',
       :keystone_password     => 'secretpassword',
+      :heat_clients_url      => '<SERVICE DEFAULT>',
     }
   end
 
@@ -132,6 +133,10 @@ describe 'heat' do
       is_expected.to contain_heat_config('oslo_middleware/enable_proxy_headers_parsing').with_value('<SERVICE DEFAULT>')
     end
 
+    it 'sets clients_heat url' do
+      is_expected.to contain_heat_config('clients_heat/url').with_value('<SERVICE DEFAULT>')
+    end
+
     it_configures "with default auth method"
   end