diff --git a/ansible/gather-facts.yml b/ansible/gather-facts.yml
index b47ecf6095..48f17ef3c2 100644
--- a/ansible/gather-facts.yml
+++ b/ansible/gather-facts.yml
@@ -12,17 +12,17 @@
   serial: '{{ kolla_serial|default("0") }}'
   gather_facts: false
   tasks:
+    - name: Group hosts to determine when using --limit
+      group_by:
+        key: "all_using_limit_{{ (ansible_play_batch | length) != (groups['all'] | length) }}"
+      changed_when: false
+
     - name: Gather facts
       setup:
         filter: "{{ kolla_ansible_setup_filter }}"
         gather_subset: "{{ kolla_ansible_setup_gather_subset }}"
       when:
         - not ansible_facts
-
-    - name: Group hosts to determine when using --limit
-      group_by:
-        key: "all_using_limit_{{ (ansible_play_batch | length) != (groups['all'] | length) }}"
-      changed_when: false
   tags: always
 
 # NOTE(pbourke): This case covers deploying subsets of hosts using --limit. The