diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml
index 73c81ae5f9..c4145420ea 100644
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@@ -47,9 +47,13 @@
         ref_list: "{{ groups['aodh_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 0d3556e387..0a54351ca9 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -88,9 +88,13 @@
         ref_list: "{{ groups['cinder_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index 95fde56691..1e4ed95df8 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -64,9 +64,13 @@
         ref_list: "{{ groups['glance_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml
index ea1862f240..42b20d736e 100644
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -47,9 +47,13 @@
         ref_list: "{{ groups['heat_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml
index 06ef43b54a..7c071cf03c 100644
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@@ -47,9 +47,13 @@
         ref_list: "{{ groups['horizon_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml
index b2028edacd..efe97e0903 100644
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@@ -97,9 +97,13 @@
         ref_list: "{{ groups['ironic_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
   roles:
     - role: "os_ironic"
       ironic_venv_tag: "{{ openstack_release }}"
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index 33f920e3ba..542f732129 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -47,9 +47,13 @@
         ref_list: "{{ groups['keystone_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 08676e73f1..e50c45dbe6 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -66,9 +66,13 @@
         ref_list: "{{ groups['neutron_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Create log dir
       file:
         path: "{{ item.path }}"
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index b104eadfd1..74943609cd 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -47,9 +47,13 @@
         ref_list: "{{ groups['nova_all'] }}"
         src_list: "{{ rabbitmq_servers }}"
       register: servers
+      tags:
+        - always
     - name: Set rabbitmq servers
       set_fact:
         rabbitmq_servers: "{{ servers.sorted_list }}"
+      tags:
+        - always
     - name: Add nbd devices to the compute
       shell: |
         for i in /dev/nbd*;do