Merge "Remove deprecated kolla_tls_cert variable"

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

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

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.