Merge "Return facts gathering to pre_tasks for masakari"

playbooks/os-masakari-install.yml

@@ -13,20 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Gather masakari facts
-  hosts: masakari_all
-  gather_facts: "{{ osa_gather_facts | default(True) }}"
-  vars:
-    pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}"
-  tasks:
-    - name: Gather additional facts
-      include_tasks: "common-tasks/gather-hardware-facts.yml"
-      vars:
-        deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}"
-        deployment_extra_facts_subset: "!all,network"
-  tags:
-    - always
-
 - name: Setup corosync cluster
   hosts: masakari_monitor
   gather_facts: false
@@ -36,6 +22,18 @@
     pacemaker_corosync_group: masakari_monitor
     pacemaker_corosync_ring_interface: "{{ masakari_monitor_corosync_multicast_interface }}"
     haveged_enabled: false
+  pre_tasks:
+    - name: Gather additional facts
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      vars:
+        deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}"
+        deployment_extra_facts_subset: "!all,network"
+      args:
+        apply:
+          tags:
+            - always
+      tags:
+        - always
   roles:
     - role: "pacemaker_corosync"
       tags: pacemaker-corosync
@@ -49,6 +47,15 @@
     - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
+    - name: Gather additional facts
+      include_tasks: "common-tasks/gather-hardware-facts.yml"
+      args:
+        apply:
+          tags:
+            - always
+      tags:
+        - always
+
     # In order to ensure that any container, software or
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain