openstack/kolla-ansible
Code Issues Proposed changes

Merge "magnum: Add CA certificate configuration for internal TLS"

Browse Source
This commit is contained in:
Zuul 2021-07-01 10:14:33 +00:00 committed by Gerrit Code Review
commit ad6dbab260
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/magnum/templates/magnum.conf.j2
View File

@ -32,30 +32,37 @@ endpoint_type = publicURL
[heat_client] [heat_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[octavia_client] [octavia_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[cinder_client] [cinder_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[barbican_client] [barbican_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[glance_client] [glance_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[neutron_client] [neutron_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[nova_client] [nova_client]
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
ca_file = {{ openstack_cacert }}
[keystone_auth] [keystone_auth]
auth_url = {{ keystone_internal_url }}/v3 auth_url = {{ keystone_internal_url }}/v3
@ -78,6 +85,7 @@ user_domain_name = {{ default_user_domain_name }}
project_name = service project_name = service
username = {{ magnum_keystone_user }} username = {{ magnum_keystone_user }}
password = {{ magnum_keystone_password }} password = {{ magnum_keystone_password }}
cafile = {{ openstack_cacert }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT

5
releasenotes/notes/fix-magnum-tls-cacert-dd5ab5729391beb2.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes an issue with Magnum when TLS is enabled. `LP#781062
<https://review.opendev.org/c/openstack/kolla-ansible/+/781062>`__