From 04382c80315ee4d4a5d9796b76a9a0347927c6ff Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 26 Mar 2020 15:08:30 +0800
Subject: [PATCH] Add glance_ca_certificates_file when using self sign cert in
glance
Change-Id: I9395ae32378f4ff1fd57be78d7daec7745579e04
Closes-Bug: #1869133
---
ansible/roles/cinder/templates/cinder.conf.j2 | 1 +
releasenotes/notes/bug-1869133-e8f086c533ebbc41.yaml | 5 +++++
2 files changed, 6 insertions(+)
create mode 100644 releasenotes/notes/bug-1869133-e8f086c533ebbc41.yaml
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 4881d8c25c..85ac60d832 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -17,6 +17,7 @@ glance_api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn | put_add
glance_num_retries = {{ groups['glance-api'] | length }}
glance_api_version = 2
+glance_ca_certificates_file = {{ openstack_cacert | default(omit) }}
os_region_name = {{ openstack_region_name }}
diff --git a/releasenotes/notes/bug-1869133-e8f086c533ebbc41.yaml b/releasenotes/notes/bug-1869133-e8f086c533ebbc41.yaml
new file mode 100644
index 0000000000..05557e1edf
--- /dev/null
+++ b/releasenotes/notes/bug-1869133-e8f086c533ebbc41.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fix missing glance_ca_certificates_file variable in glance.conf.
+ `LP#1869133 <https://bugs.launchpad.net/kolla-ansible/+bug/1869133>`__