diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 82f3d899ef8f91ee280e997173a7e8691b27e4b3..3ccad65ce38b3105978fc8499dcd4e20d5d793d7 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -629,9 +629,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 9e37380bd13e244277f8841047437da5d610a513..45cabe12d160474673293ddb2e9dce064737141a 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.