Merge "Fix faulty precheck for RabbitMQ"

This commit is contained in:
Zuul 2023-04-24 09:55:10 +00:00 committed by Gerrit Code Review
commit 3b24d77c48
3 changed files with 12 additions and 0 deletions

View File

@ -125,3 +125,5 @@ rabbitmq_feature_flags:
- "virtual_host_metadata"
- "maintenance_mode_status"
- "user_limits"
kolla_externally_managed_cert: False

View File

@ -88,6 +88,7 @@
- "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-cert.pem"
- "{{ kolla_certificates_dir }}/rabbitmq-cert.pem"
when:
- not kolla_externally_managed_cert | bool
- rabbitmq_enable_tls | bool
- name: Check if TLS key exists for RabbitMQ
@ -101,6 +102,7 @@
- "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-key.pem"
- "{{ kolla_certificates_dir }}/rabbitmq-key.pem"
when:
- not kolla_externally_managed_cert | bool
- rabbitmq_enable_tls | bool
- name: Checking free port for outward RabbitMQ
@ -179,6 +181,7 @@
- "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-cert.pem"
- "{{ kolla_certificates_dir }}/outward_rabbitmq-cert.pem"
when:
- not kolla_externally_managed_cert | bool
- enable_outward_rabbitmq | bool
- rabbitmq_enable_tls | bool
@ -193,6 +196,7 @@
- "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-key.pem"
- "{{ kolla_certificates_dir }}/outward_rabbitmq-key.pem"
when:
- not kolla_externally_managed_cert | bool
- enable_outward_rabbitmq | bool
- rabbitmq_enable_tls | bool

View File

@ -0,0 +1,6 @@
---
fixes:
- |
The precheck for RabbitMQ failed incorrectly when
``kolla_externally_managed_cert`` was set to ``true``.
`LP#1999081 <https://bugs.launchpad.net/kolla-ansible/+bug/1999081>`__