Skip to content

Commit 4a45e6c

Browse files
committed
ci-multinode: Add Kolla Ansible TLS config to globals.yml
Previously we provided an additional file, globals-tls-config.yml, which would be appended to globals.yml at an appropriate point during multinode deployment. This could result in a merge conflict, which cannot be resolved by an automated process such as a GitHub Actions workflow. This change adds the TLS config to globals.yml conditionally, based on whether internal TLS is enabled. We are not removing globals-tls-config.yml for now, since it is used in the terraform-kayobe-multinode repo as a proxy for internal TLS support. The file has already been removed in the Antelope branch.
1 parent 67181e8 commit 4a45e6c

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

etc/kayobe/environments/ci-multinode/kolla/globals.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,15 @@ designate_ns_record:
4444
designate_backend: "bind9"
4545
designate_recursion: "yes"
4646
designate_forwarders_addresses: "1.1.1.1; 8.8.8.8"
47+
48+
{% if kolla_enable_tls_internal | bool %}
49+
############################################################################
50+
# Internal and backend TLS configuration
51+
52+
# Copy the self-signed CA into the kolla containers
53+
kolla_copy_ca_into_containers: "yes"
54+
openstack_cacert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if os_distribution == 'rocky' else '/etc/ssl/certs/ca-certificates.crt' }}"
55+
kolla_enable_tls_backend: "yes"
56+
rabbitmq_enable_tls: "yes"
57+
58+
{% endif %}

0 commit comments

Comments
 (0)