diff --git a/playbooks/ceph-install.yml b/playbooks/ceph-install.yml index 5f1b7b6d9a..c82f14116f 100644 --- a/playbooks/ceph-install.yml +++ b/playbooks/ceph-install.yml @@ -28,7 +28,8 @@ pre_tasks: - name: Gather additional facts for monitor_address_block - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: "ansible_all_ipv[4|6]_addresses" deployment_extra_facts_subset: "!all,network" @@ -41,7 +42,8 @@ - always - name: Gather additional facts for monitor_interface - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: "{{ 'ansible_' ~ monitor_interface | replace('-','_') }}" deployment_extra_facts_subset: "!all,network" @@ -54,7 +56,8 @@ - always - name: Gather memory facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: "ansible_memtotal*" deployment_extra_facts_subset: "!all,hardware" @@ -136,7 +139,8 @@ pre_tasks: - name: Gather memory facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: "ansible_memtotal*" deployment_extra_facts_subset: "!all,hardware" @@ -192,7 +196,8 @@ - "defaults/{{ install_method }}_install.yml" pre_tasks: - name: Gather memory facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: "ansible_memtotal*" deployment_extra_facts_subset: "!all,hardware" diff --git a/playbooks/common-tasks/gather-hardware-facts.yml b/playbooks/common-tasks/gather-hardware-facts.yml deleted file mode 100644 index dd0b38d5aa..0000000000 --- a/playbooks/common-tasks/gather-hardware-facts.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -# Copyright 2021, City Network International AB -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Gather additional facts - setup: - gather_subset: "{{ deployment_extra_facts_subset }}" - filter: "{{ deployment_extra_facts_filter }}" diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index b55c3c8417..8d4c1953bd 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/haproxy-install.yml b/playbooks/haproxy-install.yml index 418259364b..c84b4a8bf3 100644 --- a/playbooks/haproxy-install.yml +++ b/playbooks/haproxy-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-adjutant-install.yml b/playbooks/os-adjutant-install.yml index e66e1449c8..a6a0c91b4b 100644 --- a/playbooks/os-adjutant-install.yml +++ b/playbooks/os-adjutant-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 1713e3b719..b2559caf4d 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index 6c39bd2a3a..aec4af66c7 100644 --- a/playbooks/os-barbican-install.yml +++ b/playbooks/os-barbican-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-blazar-install.yml b/playbooks/os-blazar-install.yml index 6a579b239a..0d0c6fffb0 100644 --- a/playbooks/os-blazar-install.yml +++ b/playbooks/os-blazar-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index eb111209b4..2612e880c2 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-cloudkitty-install.yml b/playbooks/os-cloudkitty-install.yml index f6d52e150d..4999b0deb7 100644 --- a/playbooks/os-cloudkitty-install.yml +++ b/playbooks/os-cloudkitty-install.yml @@ -19,7 +19,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index e9a97d9046..76d79e6ef9 100644 --- a/playbooks/os-designate-install.yml +++ b/playbooks/os-designate-install.yml @@ -21,7 +21,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 5524f462d0..749dbffe91 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index fb3b8626f2..046560366b 100644 --- a/playbooks/os-gnocchi-install.yml +++ b/playbooks/os-gnocchi-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index bebec2bfb7..3b5cf02fac 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index cb345a9ad8..de9c7ba348 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index 1a9e951f5e..a9ab7fbbfb 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index e7f012c4c6..1e219f1875 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -35,7 +35,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index dc1a160a7b..2c1106430c 100644 --- a/playbooks/os-magnum-install.yml +++ b/playbooks/os-magnum-install.yml @@ -21,7 +21,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-manila-install.yml b/playbooks/os-manila-install.yml index d4ef352ab9..1446dec797 100644 --- a/playbooks/os-manila-install.yml +++ b/playbooks/os-manila-install.yml @@ -41,7 +41,8 @@ - "defaults/{{ install_method }}_install.yml" pre_tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts args: apply: tags: diff --git a/playbooks/os-masakari-install.yml b/playbooks/os-masakari-install.yml index 42c86ff658..34659c26f2 100644 --- a/playbooks/os-masakari-install.yml +++ b/playbooks/os-masakari-install.yml @@ -30,7 +30,8 @@ haveged_enabled: false pre_tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: "{{ 'ansible_' ~ pacemaker_corosync_ring_interface | replace('-','_') }}" deployment_extra_facts_subset: "!all,network" @@ -62,7 +63,8 @@ - "defaults/{{ install_method }}_install.yml" pre_tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts args: apply: tags: diff --git a/playbooks/os-mistral-install.yml b/playbooks/os-mistral-install.yml index e832ecc79c..ad7e4cab62 100644 --- a/playbooks/os-mistral-install.yml +++ b/playbooks/os-mistral-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index 7111f6b64b..9750efcf97 100644 --- a/playbooks/os-octavia-install.yml +++ b/playbooks/os-octavia-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-placement-install.yml b/playbooks/os-placement-install.yml index ba4336af0b..5e11e761bd 100644 --- a/playbooks/os-placement-install.yml +++ b/playbooks/os-placement-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-skyline-install.yml b/playbooks/os-skyline-install.yml index 3f4414cc09..833eca517e 100644 --- a/playbooks/os-skyline-install.yml +++ b/playbooks/os-skyline-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index 554e9acd3d..29ab3b9397 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index 016a979e55..ad338649d7 100644 --- a/playbooks/os-tacker-install.yml +++ b/playbooks/os-tacker-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 4cf6cdc196..8592e199e0 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index d47ad390a3..b51596d252 100644 --- a/playbooks/os-trove-install.yml +++ b/playbooks/os-trove-install.yml @@ -21,7 +21,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/os-zun-install.yml b/playbooks/os-zun-install.yml index 54dc6904a7..7c53f2ec37 100644 --- a/playbooks/os-zun-install.yml +++ b/playbooks/os-zun-install.yml @@ -18,7 +18,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts when: osa_gather_facts | default(True) tags: - always diff --git a/playbooks/security-hardening.yml b/playbooks/security-hardening.yml index 1de3565a0e..0e4a1c0a9b 100644 --- a/playbooks/security-hardening.yml +++ b/playbooks/security-hardening.yml @@ -22,7 +22,8 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" tasks: - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" + include_role: + name: openstack.osa.gather_extra_facts vars: deployment_extra_facts_filter: ansible_mounts deployment_extra_facts_subset: "!all,hardware"