From af9eb7e2a8d74cd04c39d31d8dddcf8214ff80ff Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 5 Feb 2025 07:49:22 +1000 Subject: [PATCH] Gather ansible_local facts at the start of each service We depend on a custom fact for bootc deployments. This change ensures we gather at least ansible_local facts at the beginning of each service. Signed-off-by: Brendan Shephard --- playbooks/configure_network.yml | 4 ++++ playbooks/configure_os.yml | 4 ++++ playbooks/download_cache.yml | 4 ++++ playbooks/install_certs.yml | 4 ++++ playbooks/install_os.yml | 4 ++++ playbooks/libvirt.yml | 4 ++++ playbooks/neutron_metadata.yml | 4 ++++ playbooks/neutron_ovn.yaml | 4 ++++ playbooks/nova.yml | 4 ++++ playbooks/ovn.yml | 4 ++++ playbooks/run_os.yml | 4 ++++ playbooks/telemetry.yml | 4 ++++ playbooks/validate_network.yml | 4 ++++ 13 files changed, 52 insertions(+) diff --git a/playbooks/configure_network.yml b/playbooks/configure_network.yml index cf91efbb2..99b62d66d 100644 --- a/playbooks/configure_network.yml +++ b/playbooks/configure_network.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Import edpm_ovs to install ovs packages ansible.builtin.import_role: name: osp.edpm.edpm_ovs diff --git a/playbooks/configure_os.yml b/playbooks/configure_os.yml index c93a2b540..439267d14 100644 --- a/playbooks/configure_os.yml +++ b/playbooks/configure_os.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Configure edpm_podman ansible.builtin.import_role: name: osp.edpm.edpm_podman diff --git a/playbooks/download_cache.yml b/playbooks/download_cache.yml index ce430ad4d..d8d52a35c 100644 --- a/playbooks/download_cache.yml +++ b/playbooks/download_cache.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Import edpm_download_cache ansible.builtin.import_role: name: osp.edpm.edpm_download_cache diff --git a/playbooks/install_certs.yml b/playbooks/install_certs.yml index 57081d583..1b7c21d44 100644 --- a/playbooks/install_certs.yml +++ b/playbooks/install_certs.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Install EDPM Certs ansible.builtin.import_role: name: osp.edpm.edpm_install_certs diff --git a/playbooks/install_os.yml b/playbooks/install_os.yml index 3b1071bde..ec1356a43 100644 --- a/playbooks/install_os.yml +++ b/playbooks/install_os.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Install edpm_podman ansible.builtin.import_role: name: osp.edpm.edpm_podman diff --git a/playbooks/libvirt.yml b/playbooks/libvirt.yml index 7262bd129..5cf54ab6f 100644 --- a/playbooks/libvirt.yml +++ b/playbooks/libvirt.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Deploy EDPM libvirt ansible.builtin.import_role: name: osp.edpm.edpm_libvirt diff --git a/playbooks/neutron_metadata.yml b/playbooks/neutron_metadata.yml index fa9444838..f73ecd34a 100644 --- a/playbooks/neutron_metadata.yml +++ b/playbooks/neutron_metadata.yml @@ -6,6 +6,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Neutron OVN Metadata agent ansible.builtin.import_role: name: osp.edpm.edpm_neutron_metadata diff --git a/playbooks/neutron_ovn.yaml b/playbooks/neutron_ovn.yaml index 1a8501183..5a8f4fec5 100644 --- a/playbooks/neutron_ovn.yaml +++ b/playbooks/neutron_ovn.yaml @@ -6,6 +6,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Neutron OVN agent ansible.builtin.import_role: name: osp.edpm.edpm_neutron_ovn diff --git a/playbooks/nova.yml b/playbooks/nova.yml index 621bed83f..a596f9fd4 100644 --- a/playbooks/nova.yml +++ b/playbooks/nova.yml @@ -9,6 +9,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Deploy EDPM Nova ansible.builtin.import_role: name: osp.edpm.edpm_nova diff --git a/playbooks/ovn.yml b/playbooks/ovn.yml index bc4bbf468..93c3daa5c 100644 --- a/playbooks/ovn.yml +++ b/playbooks/ovn.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Deploy EDPM OVN ansible.builtin.import_role: name: osp.edpm.edpm_ovn diff --git a/playbooks/run_os.yml b/playbooks/run_os.yml index d2d7afa25..cfdc64b05 100644 --- a/playbooks/run_os.yml +++ b/playbooks/run_os.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Run edpm_sshd ansible.builtin.import_role: name: osp.edpm.edpm_sshd diff --git a/playbooks/telemetry.yml b/playbooks/telemetry.yml index 438beb080..06fedabc4 100644 --- a/playbooks/telemetry.yml +++ b/playbooks/telemetry.yml @@ -23,6 +23,10 @@ max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" # Doesn't handle rsyslog tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + - name: Deploy telemetry metrics ansible.builtin.import_role: name: osp.edpm.edpm_telemetry diff --git a/playbooks/validate_network.yml b/playbooks/validate_network.yml index 5787744b7..639289589 100644 --- a/playbooks/validate_network.yml +++ b/playbooks/validate_network.yml @@ -7,6 +7,10 @@ any_errors_fatal: "{{ edpm_any_errors_fatal | default(true) }}" max_fail_percentage: "{{ edpm_max_fail_percentage | default(0) }}" tasks: + - name: Gather ansible_local facts + ansible.builtin.setup: + filter: ansible_local + # Pings only IPv4 - name: Import edpm_nodes_validation ansible.builtin.import_role: