Use gather_extra_facts role from plugins collection

Remove the common-tasks version of this function and instead call a role from the openstack-ansible-plugins collection. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/923403 Change-Id: I162de91b4988542b9301be76274c30e8e74d0d47
2024-07-03 14:49:57 +01:00
parent 736d432707
commit 9a37e1fd0d
30 changed files with 68 additions and 53 deletions
--- 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"
--- a/playbooks/common-tasks/gather-hardware-facts.yml
+++ b/playbooks/common-tasks/gather-hardware-facts.yml
@@ -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 }}"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"