From 455f2c31477924746c2ab6ecfd6e0fce00798549 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 5 Nov 2020 09:08:41 +0000
Subject: [PATCH] Revert "CI: Temporarily disable rabbitmq internal tls"
This reverts commit ff441c1c0ceb8fc06a17f5db8e460ad00e8db365.
Since RabbitMQ TLS is still not functional in Victoria, it is
not enabled for upgrade jobs.
Change-Id: I575942c8d90441145de78dcb16a2b4c1f172773b
---
tests/templates/globals-default.j2 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 84e85dffaa..75d9b995df 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -134,8 +134,11 @@ openstack_cacert: "/etc/ssl/certs/ca-certificates.crt"
openstack_cacert: "/etc/pki/tls/certs/ca-bundle.crt"
{% endif %}
kolla_admin_openrc_cacert: "{% raw %}{{ kolla_certificates_dir }}{% endraw %}/ca/root.crt"
-# FIXME(mnasiadka): Re-enable when https://review.opendev.org/#/c/761194/ is merged
-rabbitmq_enable_tls: "no"
+# TODO(mgoddard): Remove the condition when Victoria supports RabbitMQ TLS,
+# or the previous release is no longer Victoria.
+{% if not is_upgrade or previous_release != "victoria" %}
+rabbitmq_enable_tls: "yes"
+{% endif %}
{% endif %}
{% if scenario == 'linuxbridge' %}