diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 501b4b86e8e7fcbce4f7fd23452f7463c03683ba..fad42d389cb7752091ad1246c591b383cac0a0e3 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -626,9 +626,7 @@ kolla_external_fqdn: "{{ public_net_name | net_fqdn or kolla_external_vip_addres # certificate bundle for the external API. # # Note that this should be formatted as a literal style block scalar. -# TODO(mgoddard): Remove the deprecated support for kolla_tls_cert in the -# Ussuri cycle. -kolla_external_tls_cert: "{{ kolla_tls_cert | default }}" +kolla_external_tls_cert: # Path to a CA certificate file to use for the OS_CACERT environment variable # in public-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index a07406f016dc7abf9ea63d70d4368c581593806c..a2084da099e0df9b72358bd15e13aab6f35df9a2 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -456,9 +456,6 @@ # certificate bundle for the external API. # # Note that this should be formatted as a literal style block scalar. -# -# NOTE: kolla_tls_cert has been renamed to kolla_external_tls_cert. Support for -# the deprecated name kolla_tls_cert will be removed in a future release. #kolla_external_tls_cert: # Path to a CA certificate file to use for the OS_CACERT environment variable diff --git a/releasenotes/notes/remove-kolla-tls-cert-b2852583b9a1e214.yaml b/releasenotes/notes/remove-kolla-tls-cert-b2852583b9a1e214.yaml new file mode 100644 index 0000000000000000000000000000000000000000..d4c8ebd4370452f317b3b41353c6db9babf996bc --- /dev/null +++ b/releasenotes/notes/remove-kolla-tls-cert-b2852583b9a1e214.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The variable ``kolla_tls_cert`` which was deprecated in the Train release + has been removed. Use ``kolla_external_tls_cert`` instead.