diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml
index 6857ea4ccf..452ef7797a 100644
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@@ -67,6 +67,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['aodh_api'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - aodh-rabbitmq
         - aodh-rabbitmq-vhost
@@ -82,6 +83,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['aodh_api'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - aodh-rabbitmq
         - aodh-rabbitmq-user
diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml
index 6123684544..3ec24c2c93 100644
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@@ -78,6 +78,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['ceilometer_api'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - ceilometer-rabbitmq
         - ceilometer-rabbitmq-vhost
@@ -93,6 +94,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['ceilometer_api'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - ceilometer-rabbitmq
         - ceilometer-rabbitmq-user
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index ebc66ed7cd..0d3556e387 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -119,6 +119,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['cinder_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - cinder-rabbitmq
         - cinder-rabbitmq-vhost
@@ -134,6 +135,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['cinder_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - cinder-rabbitmq
         - cinder-rabbitmq-user
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index e6427278a9..95fde56691 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -95,6 +95,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['glance_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - glance-rabbitmq
         - glance-rabbitmq-vhost
@@ -110,6 +111,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['glance_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - glance-rabbitmq
         - glance-rabbitmq-user
diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml
index 591563af02..ea1862f240 100644
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -78,6 +78,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['heat_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - heat-rabbitmq
         - heat-rabbitmq-vhost
@@ -93,6 +94,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['heat_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - heat-rabbitmq
         - heat-rabbitmq-user
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index c74432d772..33f920e3ba 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -95,6 +95,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['keystone_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - keystone-rabbitmq
         - keystone-rabbitmq-vhost
@@ -110,6 +111,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['keystone_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - keystone-rabbitmq
         - keystone-rabbitmq-user
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index f776c2f02c..08676e73f1 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -97,6 +97,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['neutron_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - neutron-rabbitmq
         - neutron-rabbitmq-vhost
@@ -112,6 +113,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['neutron_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - neutron-rabbitmq
         - neutron-rabbitmq-user
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index 32b714b0b3..c6b4c50d36 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -130,6 +130,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['nova_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - nova-rabbitmq
         - nova-rabbitmq-vhost
@@ -145,6 +146,7 @@
       delegate_to: "{{ groups['rabbitmq_all'][0] }}"
       when:
         - inventory_hostname == groups['nova_all'][0]
+        - groups['rabbitmq_all']|length > 0
       tags:
         - nova-rabbitmq
         - nova-rabbitmq-user