Merge "Revert "CI: Temporarily disable rabbitmq internal tls""

tests/templates/globals-default.j2

@@ -133,8 +133,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' %}