diff --git a/ansible/roles/rabbitmq/tasks/precheck.yml b/ansible/roles/rabbitmq/tasks/precheck.yml
index 3b0b6efd8a..4002ba3caf 100644
--- a/ansible/roles/rabbitmq/tasks/precheck.yml
+++ b/ansible/roles/rabbitmq/tasks/precheck.yml
@@ -78,30 +78,30 @@
     - not item.1 is match('^'+('api' | kolla_address(item.0.item))+'\\b')
 
 - name: Check if TLS certificate exists for RabbitMQ
+  assert:
+    that: cert | length > 0
+    fail_msg: No TLS certificate provided for RabbitMQ.
   vars:
     cert: "{{ query('first_found', paths, errors='ignore') }}"
     paths:
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}/rabbitmq-cert.pem"
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-cert.pem"
       - "{{ kolla_certificates_dir }}/rabbitmq-cert.pem"
-  fail:
-    msg: No TLS certificate provided for RabbitMQ.
   when:
     - rabbitmq_enable_tls | bool
-    - cert | length == 0
 
 - name: Check if TLS key exists for RabbitMQ
+  assert:
+    that: key | length > 0
+    fail_msg: No TLS key provided for RabbitMQ.
   vars:
     key: "{{ query('first_found', paths, errors='ignore') }}"
     paths:
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}/rabbitmq-key.pem"
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-key.pem"
       - "{{ kolla_certificates_dir }}/rabbitmq-key.pem"
-  fail:
-    msg: No TLS key provided for RabbitMQ.
   when:
     - rabbitmq_enable_tls | bool
-    - key | length == 0
 
 - name: Checking free port for outward RabbitMQ
   wait_for:
@@ -169,29 +169,29 @@
     - not item.1 is match('^'+('api' | kolla_address(item.0.item))+'\\b')
 
 - name: Check if TLS certificate exists for outward RabbitMQ
+  assert:
+    that: cert | length > 0
+    fail_msg: No TLS certificate provided for outward RabbitMQ.
   vars:
     cert: "{{ query('first_found', paths, errors='ignore') }}"
     paths:
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}/outward_rabbitmq-cert.pem"
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-cert.pem"
       - "{{ kolla_certificates_dir }}/outward_rabbitmq-cert.pem"
-  fail:
-    msg: No TLS certificate provided for outward RabbitMQ.
   when:
     - enable_outward_rabbitmq | bool
     - rabbitmq_enable_tls | bool
-    - cert | length == 0
 
 - name: Check if TLS key exists for outward RabbitMQ
+  assert:
+    that: key | length > 0
+    msg: No TLS key provided for outward RabbitMQ.
   vars:
     key: "{{ query('first_found', paths, errors='ignore') }}"
     paths:
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}/outward_rabbitmq-key.pem"
       - "{{ kolla_certificates_dir }}/{{ inventory_hostname }}-key.pem"
       - "{{ kolla_certificates_dir }}/outward_rabbitmq-key.pem"
-  fail:
-    msg: No TLS key provided for outward RabbitMQ.
   when:
     - enable_outward_rabbitmq | bool
     - rabbitmq_enable_tls | bool
-    - key | length == 0