openstack/kolla-ansible
Code Issues Proposed changes

Revert "CI: Temporarily disable rabbitmq internal tls"

Browse Source 
This reverts commit ff441c1c0c.

Since RabbitMQ TLS is still not functional in Victoria, it is
not enabled for upgrade jobs.

Change-Id: I575942c8d90441145de78dcb16a2b4c1f172773b
This commit is contained in:
Mark Goddard
2020-11-05 09:08:41 +00:00
parent ff441c1c0c
commit 455f2c3147
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/templates/globals-default.j2
View File

@@ -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' %}