facts: explicitly disable facter and ohai

By default, ansible gathers facts from facter and ohai if installed on
the remote nodes, given we don't need them, let's exclude these facts
from our facts gathering

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/infrastructure-playbooks/add-mon.yml b/infrastructure-playbooks/add-mon.yml
index 3a6a76a235fbd1c93b84d78a381b975b6b35e47a..c74c895898cf9426be5802a7c57e7a984337a361 100644 (file)
--- a/infrastructure-playbooks/add-mon.yml
+++ b/infrastructure-playbooks/add-mon.yml
@@ -16,12 +16,20 @@
 
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
     - import_role:
         name: ceph-defaults
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: true
       with_items: "{{ groups[mon_group_name] }}"

diff --git a/infrastructure-playbooks/add-osd.yml b/infrastructure-playbooks/add-osd.yml
index 00897384837a2b38428d6feda021b434247cdb11..a47e084afd3ef9e949a17526acfb1afdc0a4c6af 100644 (file)
--- a/infrastructure-playbooks/add-osd.yml
+++ b/infrastructure-playbooks/add-osd.yml
@@ -30,6 +30,10 @@
 
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool
 
     - import_role:
@@ -37,6 +41,10 @@
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items:
@@ -63,6 +71,10 @@
 
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool
 
     - import_role:
@@ -70,6 +82,10 @@
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items:

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 4e052545222fc5a43629ae0bfa1393f0a3d111df..db41289270e98708a6fe8a97981e100da8dd35e5 100644 (file)
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -44,10 +44,18 @@
 
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: true
       with_items: "{{ groups['all'] | difference(groups.get('clients', [])) }}"

diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml
index 123cba60e3dc251280a3d6f7ee91e4b41a16e236..5e9e048c63a3127dd9a7b65414805d2c07e01baa 100644 (file)
--- a/infrastructure-playbooks/docker-to-podman.yml
+++ b/infrastructure-playbooks/docker-to-podman.yml
@@ -27,10 +27,18 @@
     # pre-tasks for following import -
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups['all'] | difference(groups.get(client_group_name | default('clients'), [])) }}"

diff --git a/infrastructure-playbooks/filestore-to-bluestore.yml b/infrastructure-playbooks/filestore-to-bluestore.yml
index 170158e02196c3922388f0dea548f0f76d585ab4..cd234b4d3e10856453822ec60b7d1f22fad750d1 100644 (file)
--- a/infrastructure-playbooks/filestore-to-bluestore.yml
+++ b/infrastructure-playbooks/filestore-to-bluestore.yml
@@ -12,6 +12,10 @@
   tasks:
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups[mon_group_name] }}"
@@ -279,6 +283,10 @@
 
         - name: refresh ansible devices fact
           setup:
+            gather_subset:
+              - 'all'
+              - '!facter'
+              - '!ohai'
             filter: ansible_devices
           when: osd_auto_discovery | bool
 

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index e98ce43e9949b2f657b82448700a6afde2b8fe0d..93e43cf42088882def8425ecc0d53fbb8ea73141 100644 (file)
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -61,6 +61,10 @@
     - block:
         - name: get nfs nodes ansible facts
           setup:
+            gather_subset:
+              - 'all'
+              - '!facter'
+              - '!ohai'
           delegate_to: "{{ item }}"
           delegate_facts: True
           with_items: "{{ groups[nfs_group_name] }}"

diff --git a/infrastructure-playbooks/purge-container-cluster.yml b/infrastructure-playbooks/purge-container-cluster.yml
index bf56df2cfb5e6091ecfa64541bf073fc26974bde..c326735a5b265f71a39e812bd28db181de7e5dbb 100644 (file)
--- a/infrastructure-playbooks/purge-container-cluster.yml
+++ b/infrastructure-playbooks/purge-container-cluster.yml
@@ -45,6 +45,10 @@
     - block:
         - name: get nfs nodes ansible facts
           setup:
+            gather_subset:
+              - 'all'
+              - '!facter'
+              - '!ohai'
           delegate_to: "{{ item }}"
           delegate_facts: True
           with_items: "{{ groups[nfs_group_name] }}"
@@ -249,6 +253,10 @@
 
   - name: gather monitors facts
     setup:
+      gather_subset:
+        - 'all'
+        - '!facter'
+        - '!ohai'
     delegate_to: "{{ item }}"
     delegate_facts: True
     with_items: "{{ groups.get(mon_group_name | default('mons')) }}"

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 314fe5292a7dd0a3851c2c13a73bdcf97767ce22..c74ffd2353e72b959d71891f657329b40a494da0 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -64,10 +64,18 @@
 
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups['all'] | difference(groups.get('clients', [])) }}"

diff --git a/infrastructure-playbooks/shrink-rgw.yml b/infrastructure-playbooks/shrink-rgw.yml
index 441a82c15c6be5a19f7767f88819909e07a468ca..e8e9a6cd8f544e2ae5098eb060d277ebbb2da04b 100644 (file)
--- a/infrastructure-playbooks/shrink-rgw.yml
+++ b/infrastructure-playbooks/shrink-rgw.yml
@@ -47,6 +47,10 @@
   gather_facts: false
   tasks:
     - setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
 
 - hosts: mons[0]
   become: true

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 36a1526c71c9b79d7aca150ed652a6329be16856..b5ffcf1029ea5c3bd0d6f49865745f5fd94112ee 100644 (file)
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -47,6 +47,10 @@
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups['all'] | difference(groups.get(client_group_name, [])) }}"

diff --git a/site-container.yml.sample b/site-container.yml.sample
index ccbe14f9e534aa21b1016eed3bf1392d5b0d15a8..ed2595ee16b384fb81238f105f238ef016ce4193 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -28,11 +28,19 @@
     # pre-tasks for following import -
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when: not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
       tags: always
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups['all'] | difference(groups.get('clients', [])) }}"

diff --git a/site.yml.sample b/site.yml.sample
index c29fc581b0cacc4e40cbace5af20da1441feadef..49a89900992279fad56f4026549e6f91b031261a 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -32,11 +32,19 @@
 
     - name: gather facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       when:
         - not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
 
     - name: gather and delegate facts
       setup:
+        gather_subset:
+          - 'all'
+          - '!facter'
+          - '!ohai'
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items: "{{ groups['all'] | difference(groups.get('clients', [])) }}"