From 34a331ab2f05133c58727ac4878215300959ab29 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 26 Mar 2020 15:20:52 +0800
Subject: [PATCH] Add clients ca_file in heat
This patch fix creating statck resource failure in heat.
Change-Id: I00c23f8b89765e266d045cc463ce4d863d0d6089
Closes-Bug: #1869137
---
ansible/roles/heat/templates/heat.conf.j2 | 1 +
releasenotes/notes/bug-1869137-d3de4debf827e1d2.yaml | 5 +++++
2 files changed, 6 insertions(+)
create mode 100644 releasenotes/notes/bug-1869137-d3de4debf827e1d2.yaml
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 5c58f0dc47..9e8ed436cd 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -89,6 +89,7 @@ policy_file = {{ heat_policy_file }}
[clients]
endpoint_type = internalURL
+ca_file = {{ openstack_cacert | default(omit) }}
[oslo_middleware]
enable_proxy_headers_parsing = True
diff --git a/releasenotes/notes/bug-1869137-d3de4debf827e1d2.yaml b/releasenotes/notes/bug-1869137-d3de4debf827e1d2.yaml
new file mode 100644
index 0000000000..6b4a62a917
--- /dev/null
+++ b/releasenotes/notes/bug-1869137-d3de4debf827e1d2.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Add client ca_cert file in heat
+ `LP#1869137 <https://bugs.launchpad.net/kolla-ansible/+bug/1869137>`__