diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index 6c57e9ca38..c894b436ed 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/ansible/roles/rabbitmq/defaults/main.yml @@ -125,3 +125,5 @@ rabbitmq_feature_flags: - "virtual_host_metadata" - "maintenance_mode_status" - "user_limits" + +kolla_externally_managed_cert: False diff --git a/ansible/roles/rabbitmq/tasks/precheck.yml b/ansible/roles/rabbitmq/tasks/precheck.yml index b259f87537..ad663ce729 100644 --- a/ansible/roles/rabbitmq/tasks/precheck.yml +++ b/ansible/roles/rabbitmq/tasks/precheck.yml @@ -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 diff --git a/releasenotes/notes/bug-1999081-769f1012263a48fd.yaml b/releasenotes/notes/bug-1999081-769f1012263a48fd.yaml new file mode 100644 index 0000000000..8e8a6c275a --- /dev/null +++ b/releasenotes/notes/bug-1999081-769f1012263a48fd.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + The precheck for RabbitMQ failed incorrectly when + ``kolla_externally_managed_cert`` was set to ``true``. + `LP#1999081 `__