From 336d6382a62841a8c235c978a364ecd6fcceb469 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 13 Dec 2021 17:31:22 +0100 Subject: [PATCH] Remove deprecated kolla_tls_cert variable Change-Id: If1671ac19dac4c36dd3a47bf2b8e2ae8dea5abdd --- ansible/group_vars/all/kolla | 4 +--- etc/kayobe/kolla.yml | 3 --- .../notes/remove-kolla-tls-cert-b2852583b9a1e214.yaml | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/remove-kolla-tls-cert-b2852583b9a1e214.yaml diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 501b4b86e..fad42d389 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 a07406f01..a2084da09 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 000000000..d4c8ebd43 --- /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.