From d3227cbce93d2a55b9ff0375885e0603583ec31f Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 6 Oct 2025 18:37:42 +0200 Subject: [PATCH] Adopt playbooks for ANSIBLE_GATHER_SUBSET removal With Ansible 2.18 ANSIBLE_GATHER_SUBSET env var and corresponding `gather_subset` config parameter was removed in favor of `module_defaults` parameter. We adopt our playbooks to respect previous minimal defaults for facts gathering, along with intorducing new ansible variable to control it. Without these changes all facts are being gathered by default. Change-Id: I3377b5f623fc8ca195d91ef9f9a3af43e010a99c Signed-off-by: Dmitriy Rabotyagov --- playbooks/adjutant.yml | 3 +++ playbooks/aodh.yaml | 3 +++ playbooks/barbican.yml | 3 +++ playbooks/blazar.yml | 3 +++ playbooks/ceilometer.yml | 3 +++ playbooks/ceph_install.yml | 6 ++++++ playbooks/ceph_nfs_install.yml | 3 +++ playbooks/ceph_rgw_install.yml | 3 +++ playbooks/certificate_generate.yml | 3 +++ playbooks/certificate_ssh_authority.yml | 3 +++ playbooks/cloudkitty.yml | 3 +++ playbooks/containers_lxc_create.yml | 6 ++++++ playbooks/containers_lxc_host.yml | 3 +++ playbooks/designate.yml | 3 +++ playbooks/galera_server.yml | 3 +++ playbooks/glance.yml | 3 +++ playbooks/gnocchi.yml | 3 +++ playbooks/haproxy.yml | 3 +++ playbooks/heat.yml | 3 +++ playbooks/horizon.yml | 3 +++ playbooks/infra_journal_remote.yml | 3 +++ playbooks/ironic.yml | 3 +++ playbooks/journald_remote.yml | 3 +++ playbooks/keystone.yml | 6 ++++++ playbooks/magnum.yml | 3 +++ playbooks/manila.yml | 3 +++ playbooks/masakari.yml | 3 +++ playbooks/memcached.yml | 3 +++ playbooks/mistral.yml | 3 +++ playbooks/octavia.yml | 3 +++ playbooks/openstack_hosts_setup.yml | 3 +++ playbooks/placement.yml | 3 +++ playbooks/rabbitmq_server.yml | 3 +++ playbooks/rally.yml | 3 +++ playbooks/repo.yml | 3 +++ playbooks/security_hardening.yml | 3 +++ playbooks/skyline.yml | 3 +++ playbooks/swift.yml | 3 +++ playbooks/swift_sync.yml | 3 +++ playbooks/tacker.yml | 3 +++ playbooks/tempest.yml | 3 +++ playbooks/trove.yml | 3 +++ playbooks/unbound.yml | 3 +++ playbooks/utility_host.yml | 3 +++ playbooks/zookeeper.yml | 3 +++ playbooks/zun.yml | 3 +++ .../notes/default_gather_subset-6ef9d939d0fad333.yaml | 7 +++++++ 47 files changed, 154 insertions(+) create mode 100644 releasenotes/notes/default_gather_subset-6ef9d939d0fad333.yaml diff --git a/playbooks/adjutant.yml b/playbooks/adjutant.yml index c86f0432..1140ff82 100644 --- a/playbooks/adjutant.yml +++ b/playbooks/adjutant.yml @@ -16,6 +16,9 @@ - name: Gather adjutant facts hosts: adjutant_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/aodh.yaml b/playbooks/aodh.yaml index 70612627..528131fd 100644 --- a/playbooks/aodh.yaml +++ b/playbooks/aodh.yaml @@ -16,6 +16,9 @@ - name: Gather aodh facts hosts: aodh_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/barbican.yml b/playbooks/barbican.yml index 3b8da8da..96bb47ee 100644 --- a/playbooks/barbican.yml +++ b/playbooks/barbican.yml @@ -16,6 +16,9 @@ - name: Gather barbican facts hosts: barbican_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/blazar.yml b/playbooks/blazar.yml index eb33293e..ae592a1a 100644 --- a/playbooks/blazar.yml +++ b/playbooks/blazar.yml @@ -16,6 +16,9 @@ - name: Gather blazar facts hosts: blazar_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/ceilometer.yml b/playbooks/ceilometer.yml index 81b2bc3f..8d21a636 100644 --- a/playbooks/ceilometer.yml +++ b/playbooks/ceilometer.yml @@ -16,6 +16,9 @@ - name: Gather ceilometer facts hosts: ceilometer_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/ceph_install.yml b/playbooks/ceph_install.yml index 211ee56d..ed80cbbe 100644 --- a/playbooks/ceph_install.yml +++ b/playbooks/ceph_install.yml @@ -169,6 +169,9 @@ - name: Gather ceph-osd facts hosts: ceph-osd gather_facts: "{{ osa_gather_facts | default(True) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Define discovered_interpreter_python ansible.builtin.set_fact: @@ -265,6 +268,9 @@ - name: Gather ceph-mds facts hosts: ceph-mds gather_facts: "{{ osa_gather_facts | default(True) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Define discovered_interpreter_python ansible.builtin.set_fact: diff --git a/playbooks/ceph_nfs_install.yml b/playbooks/ceph_nfs_install.yml index 4b8738ed..b5d81f09 100644 --- a/playbooks/ceph_nfs_install.yml +++ b/playbooks/ceph_nfs_install.yml @@ -16,6 +16,9 @@ - name: Gather ceph-nfs facts hosts: ceph-nfs gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Define discovered_interpreter_python ansible.builtin.set_fact: diff --git a/playbooks/ceph_rgw_install.yml b/playbooks/ceph_rgw_install.yml index 139d344c..8cb5442f 100644 --- a/playbooks/ceph_rgw_install.yml +++ b/playbooks/ceph_rgw_install.yml @@ -20,6 +20,9 @@ - name: Gather ceph-rgw facts hosts: ceph-rgw gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Define discovered_interpreter_python ansible.builtin.set_fact: diff --git a/playbooks/certificate_generate.yml b/playbooks/certificate_generate.yml index 68d2c9df..303f3748 100644 --- a/playbooks/certificate_generate.yml +++ b/playbooks/certificate_generate.yml @@ -15,6 +15,9 @@ - name: Generate any extra user certificates hosts: "{{ openstack_pki_setup_host | default('localhost') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always tasks: diff --git a/playbooks/certificate_ssh_authority.yml b/playbooks/certificate_ssh_authority.yml index bf8ee41e..f33742b6 100644 --- a/playbooks/certificate_ssh_authority.yml +++ b/playbooks/certificate_ssh_authority.yml @@ -15,6 +15,9 @@ - name: Create SSHD CA hosts: "{{ openstack_ssh_keypairs_setup_host | default('localhost') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always - sshd-ca diff --git a/playbooks/cloudkitty.yml b/playbooks/cloudkitty.yml index 1e6cf9d0..0c35f6c6 100644 --- a/playbooks/cloudkitty.yml +++ b/playbooks/cloudkitty.yml @@ -17,6 +17,9 @@ - name: Gather cloudkitty facts hosts: cloudkitty_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/containers_lxc_create.yml b/playbooks/containers_lxc_create.yml index daa15817..9f19b2af 100644 --- a/playbooks/containers_lxc_create.yml +++ b/playbooks/containers_lxc_create.yml @@ -36,6 +36,9 @@ - name: Gather lxc hosts facts hosts: "{{ lxc_host_group | default('lxc_hosts') }}" gather_facts: true + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always @@ -68,6 +71,9 @@ - name: Gather lxc containers facts hosts: all_lxc_containers gather_facts: true + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/containers_lxc_host.yml b/playbooks/containers_lxc_host.yml index 8fe1bb15..d5a992c7 100644 --- a/playbooks/containers_lxc_host.yml +++ b/playbooks/containers_lxc_host.yml @@ -16,6 +16,9 @@ - name: Gather lxc hosts facts hosts: "{{ lxc_host_group | default('lxc_hosts') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/designate.yml b/playbooks/designate.yml index c9d5efd6..ffc3b425 100644 --- a/playbooks/designate.yml +++ b/playbooks/designate.yml @@ -19,6 +19,9 @@ - name: Gather designate facts hosts: designate_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/galera_server.yml b/playbooks/galera_server.yml index bd46babd..4a47a52a 100644 --- a/playbooks/galera_server.yml +++ b/playbooks/galera_server.yml @@ -16,6 +16,9 @@ - name: Gather galera facts hosts: galera_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts include_role: diff --git a/playbooks/glance.yml b/playbooks/glance.yml index de091e8e..8c55e5d3 100644 --- a/playbooks/glance.yml +++ b/playbooks/glance.yml @@ -16,6 +16,9 @@ - name: Gather glance facts hosts: "glance_all" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/gnocchi.yml b/playbooks/gnocchi.yml index 7d26846d..a990b4e6 100644 --- a/playbooks/gnocchi.yml +++ b/playbooks/gnocchi.yml @@ -16,6 +16,9 @@ - name: Gather gnocchi facts hosts: gnocchi_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/haproxy.yml b/playbooks/haproxy.yml index 9692bddc..e61b484f 100644 --- a/playbooks/haproxy.yml +++ b/playbooks/haproxy.yml @@ -16,6 +16,9 @@ - name: Gather haproxy facts hosts: haproxy gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/heat.yml b/playbooks/heat.yml index 59d61f20..989a97bf 100644 --- a/playbooks/heat.yml +++ b/playbooks/heat.yml @@ -16,6 +16,9 @@ - name: Gather heat facts hosts: heat_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/horizon.yml b/playbooks/horizon.yml index 60593c51..d68e6fc1 100644 --- a/playbooks/horizon.yml +++ b/playbooks/horizon.yml @@ -16,6 +16,9 @@ - name: Gather horizon facts hosts: horizon_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/infra_journal_remote.yml b/playbooks/infra_journal_remote.yml index 9210abcc..8551bb7f 100644 --- a/playbooks/infra_journal_remote.yml +++ b/playbooks/infra_journal_remote.yml @@ -16,6 +16,9 @@ - name: Gather facts hosts: hosts gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/ironic.yml b/playbooks/ironic.yml index 6c49a52e..fc155b4e 100644 --- a/playbooks/ironic.yml +++ b/playbooks/ironic.yml @@ -16,6 +16,9 @@ - name: Gather ironic facts hosts: ironic_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/journald_remote.yml b/playbooks/journald_remote.yml index 9210abcc..8551bb7f 100644 --- a/playbooks/journald_remote.yml +++ b/playbooks/journald_remote.yml @@ -16,6 +16,9 @@ - name: Gather facts hosts: hosts gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/keystone.yml b/playbooks/keystone.yml index 0a62e604..6e3b27c0 100644 --- a/playbooks/keystone.yml +++ b/playbooks/keystone.yml @@ -22,6 +22,9 @@ - name: Implement openrc/clouds.yaml on the designated service host hosts: "{{ openstack_service_setup_host | default('localhost') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" become: true tags: - openrc @@ -42,6 +45,9 @@ - name: Gather keystone facts hosts: keystone_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/magnum.yml b/playbooks/magnum.yml index 9798aa47..633523d9 100644 --- a/playbooks/magnum.yml +++ b/playbooks/magnum.yml @@ -19,6 +19,9 @@ - name: Gather magnum facts hosts: magnum_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/manila.yml b/playbooks/manila.yml index cfba6a8b..c7081222 100644 --- a/playbooks/manila.yml +++ b/playbooks/manila.yml @@ -19,6 +19,9 @@ - name: Gather manila facts hosts: manila_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" serial: "{{ manila_serial | default(['1', '100%']) }}" tags: - always diff --git a/playbooks/masakari.yml b/playbooks/masakari.yml index 97aa1b5e..3ed64fda 100644 --- a/playbooks/masakari.yml +++ b/playbooks/masakari.yml @@ -16,6 +16,9 @@ - name: Gather masakari facts hosts: masakari_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/memcached.yml b/playbooks/memcached.yml index 204b67d7..fae3d606 100644 --- a/playbooks/memcached.yml +++ b/playbooks/memcached.yml @@ -16,6 +16,9 @@ - name: Gather memcached facts hosts: memcached gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/mistral.yml b/playbooks/mistral.yml index 7be1374e..d82f81d9 100644 --- a/playbooks/mistral.yml +++ b/playbooks/mistral.yml @@ -16,6 +16,9 @@ - name: Gather mistral facts hosts: mistral_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/octavia.yml b/playbooks/octavia.yml index 735b9d97..bffdef6b 100644 --- a/playbooks/octavia.yml +++ b/playbooks/octavia.yml @@ -16,6 +16,9 @@ - name: Gather octavia facts hosts: octavia_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/openstack_hosts_setup.yml b/playbooks/openstack_hosts_setup.yml index 13b514c2..f15d9d92 100644 --- a/playbooks/openstack_hosts_setup.yml +++ b/playbooks/openstack_hosts_setup.yml @@ -42,6 +42,9 @@ - name: Gather host facts hosts: "{{ openstack_host_group | default('hosts') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/placement.yml b/playbooks/placement.yml index 9bcdc8dd..4326cba8 100644 --- a/playbooks/placement.yml +++ b/playbooks/placement.yml @@ -16,6 +16,9 @@ - name: Gather placement facts hosts: placement_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/rabbitmq_server.yml b/playbooks/rabbitmq_server.yml index 9137d83d..7f46d0ac 100644 --- a/playbooks/rabbitmq_server.yml +++ b/playbooks/rabbitmq_server.yml @@ -16,6 +16,9 @@ - name: Gather rabbitmq facts hosts: "{{ rabbitmq_host_group | default('rabbitmq_all') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/rally.yml b/playbooks/rally.yml index 312980c5..88102a12 100644 --- a/playbooks/rally.yml +++ b/playbooks/rally.yml @@ -16,6 +16,9 @@ - name: Gather rally facts hosts: utility_all[0] gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/repo.yml b/playbooks/repo.yml index b51b46cb..cb1012c7 100644 --- a/playbooks/repo.yml +++ b/playbooks/repo.yml @@ -16,6 +16,9 @@ - name: Gather repo facts hosts: repo_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/security_hardening.yml b/playbooks/security_hardening.yml index 52d5e8d6..f16dac1b 100644 --- a/playbooks/security_hardening.yml +++ b/playbooks/security_hardening.yml @@ -20,6 +20,9 @@ - name: Gather security hardening facts hosts: "{{ security_host_group | default('hosts') }}" gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/skyline.yml b/playbooks/skyline.yml index 24d03619..a1ea99a9 100644 --- a/playbooks/skyline.yml +++ b/playbooks/skyline.yml @@ -16,6 +16,9 @@ - name: Gather skyline facts hosts: skyline_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts include_role: diff --git a/playbooks/swift.yml b/playbooks/swift.yml index 1102e9de..539431e1 100644 --- a/playbooks/swift.yml +++ b/playbooks/swift.yml @@ -16,6 +16,9 @@ - name: Gather swift facts hosts: swift_all:swift_remote_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/swift_sync.yml b/playbooks/swift_sync.yml index 41e6b132..e9d0ddac 100644 --- a/playbooks/swift_sync.yml +++ b/playbooks/swift_sync.yml @@ -18,6 +18,9 @@ - name: Synchronisation of swift ring and ssh keys hosts: swift_all:swift_remote_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" user: root pre_tasks: - name: Setup installation variables diff --git a/playbooks/tacker.yml b/playbooks/tacker.yml index 48d8effe..2793e9cb 100644 --- a/playbooks/tacker.yml +++ b/playbooks/tacker.yml @@ -16,6 +16,9 @@ - name: Gather tacker facts hosts: tacker_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/tempest.yml b/playbooks/tempest.yml index da0b6a17..0760b41c 100644 --- a/playbooks/tempest.yml +++ b/playbooks/tempest.yml @@ -16,6 +16,9 @@ - name: Gather tempest facts hosts: utility_all[0] gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/trove.yml b/playbooks/trove.yml index 7a7d0900..7bb3c5b9 100644 --- a/playbooks/trove.yml +++ b/playbooks/trove.yml @@ -19,6 +19,9 @@ - name: Gather trove facts hosts: trove_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/playbooks/unbound.yml b/playbooks/unbound.yml index 70bdf95e..88865024 100644 --- a/playbooks/unbound.yml +++ b/playbooks/unbound.yml @@ -16,6 +16,9 @@ - name: Gather unbound facts hosts: unbound gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/utility_host.yml b/playbooks/utility_host.yml index 6a87cb64..09d7203a 100644 --- a/playbooks/utility_host.yml +++ b/playbooks/utility_host.yml @@ -16,6 +16,9 @@ - name: Gather utility facts hosts: utility_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/zookeeper.yml b/playbooks/zookeeper.yml index 11230c1c..f98f04b2 100644 --- a/playbooks/zookeeper.yml +++ b/playbooks/zookeeper.yml @@ -16,6 +16,9 @@ - name: Gather zookeeper facts hosts: zookeeper_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tags: - always diff --git a/playbooks/zun.yml b/playbooks/zun.yml index b58f9dc9..c0929a3c 100644 --- a/playbooks/zun.yml +++ b/playbooks/zun.yml @@ -16,6 +16,9 @@ - name: Gather zun facts hosts: zun_all gather_facts: "{{ osa_gather_facts | default(true) }}" + module_defaults: + ansible.builtin.setup: + gather_subset: "{{ osa_gather_subset | default(lookup('ansible.builtin.env', 'ANSIBLE_GATHER_SUBSET', default='!all,min')) }}" tasks: - name: Gather additional facts ansible.builtin.include_role: diff --git a/releasenotes/notes/default_gather_subset-6ef9d939d0fad333.yaml b/releasenotes/notes/default_gather_subset-6ef9d939d0fad333.yaml new file mode 100644 index 00000000..239940cc --- /dev/null +++ b/releasenotes/notes/default_gather_subset-6ef9d939d0fad333.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + With deprecation and removal of ``ANSIBLE_GATHER_SUBSET``, a new Ansible + variable ``osa_gather_subset`` was implemented to replace it. + ``ANSIBLE_GATHER_SUBSET`` is still respected and is used as a fallback in + case ``osa_gather_subset`` is not defined.