From: Dimitri Savineau Date: Tue, 30 Jun 2020 14:13:42 +0000 (-0400) Subject: facts: explicitly disable facter and ohai X-Git-Tag: v4.0.26~8 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5db4219f266e925ddc150303949d1994b7a01d8b;p=ceph-ansible.git 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 (cherry picked from commit c95adc564b8be6f9f9b1ba8568072daf39da7a2c) --- diff --git a/infrastructure-playbooks/add-mon.yml b/infrastructure-playbooks/add-mon.yml index 3a6a76a23..c74c89589 100644 --- 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 d21c5c021..4b1f9755f 100644 --- a/infrastructure-playbooks/add-osd.yml +++ b/infrastructure-playbooks/add-osd.yml @@ -30,10 +30,18 @@ - name: gather facts setup: + gather_subset: + - 'all' + - '!facter' + - '!ohai' when: not delegate_facts_host | bool - name: gather and delegate facts setup: + gather_subset: + - 'all' + - '!facter' + - '!ohai' delegate_to: "{{ item }}" delegate_facts: True with_items: @@ -63,10 +71,18 @@ - name: gather facts setup: + gather_subset: + - 'all' + - '!facter' + - '!ohai' when: not delegate_facts_host | bool - name: gather and delegate facts setup: + gather_subset: + - 'all' + - '!facter' + - '!ohai' delegate_to: "{{ item }}" delegate_facts: True with_items: diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml index d68a5da44..c33a0c74f 100644 --- 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 08afcd00b..73be95345 100644 --- 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 4ce72b05f..1c615de37 100644 --- 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 d074f43ad..0a3a6acda 100644 --- 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 cbad3ef92..e96fbb645 100644 --- 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 441a82c15..e8e9a6cd8 100644 --- 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 1de18a51b..2b5382a28 100644 --- 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 ccbe14f9e..ed2595ee1 100644 --- 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 c29fc581b..49a899009 100644 --- 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', [])) }}"