Skip to content

Commit 4c12e4e

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "magnum: Add CA certificate configuration for internal TLS" into stable/victoria
2 parents 9681041 + 338d977 commit 4c12e4e

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

ansible/roles/magnum/templates/magnum.conf.j2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,37 @@ endpoint_type = publicURL
3232
[heat_client]
3333
region_name = {{ openstack_region_name }}
3434
endpoint_type = internalURL
35+
ca_file = {{ openstack_cacert }}
3536

3637
[octavia_client]
3738
region_name = {{ openstack_region_name }}
3839
endpoint_type = internalURL
40+
ca_file = {{ openstack_cacert }}
3941

4042
[cinder_client]
4143
region_name = {{ openstack_region_name }}
4244
endpoint_type = internalURL
45+
ca_file = {{ openstack_cacert }}
4346

4447
[barbican_client]
4548
region_name = {{ openstack_region_name }}
4649
endpoint_type = internalURL
50+
ca_file = {{ openstack_cacert }}
4751

4852
[glance_client]
4953
region_name = {{ openstack_region_name }}
5054
endpoint_type = internalURL
55+
ca_file = {{ openstack_cacert }}
5156

5257
[neutron_client]
5358
region_name = {{ openstack_region_name }}
5459
endpoint_type = internalURL
60+
ca_file = {{ openstack_cacert }}
5561

5662
[nova_client]
5763
region_name = {{ openstack_region_name }}
5864
endpoint_type = internalURL
65+
ca_file = {{ openstack_cacert }}
5966

6067
[keystone_auth]
6168
auth_url = {{ keystone_internal_url }}/v3
@@ -78,6 +85,7 @@ user_domain_name = {{ default_user_domain_name }}
7885
project_name = service
7986
username = {{ magnum_keystone_user }}
8087
password = {{ magnum_keystone_password }}
88+
cafile = {{ openstack_cacert }}
8189
region_name = {{ openstack_region_name }}
8290

8391
memcache_security_strategy = ENCRYPT
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with Magnum when TLS is enabled. `LP#781062
5+
<https://review.opendev.org/c/openstack/kolla-ansible/+/781062>`__

0 commit comments

Comments
 (0)