From 56bf7e4ac2533f7684b770e96cb5d61e003ae204 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Mon, 16 Dec 2024 13:17:35 +1000 Subject: [PATCH] Use local custom fact for bootc Signed-off-by: Brendan Shephard --- playbooks/bootstrap.yml | 6 +++--- roles/edpm_bootstrap/tasks/bootstrap.yml | 4 ++-- roles/edpm_bootstrap/tasks/main.yml | 2 +- roles/edpm_kernel/tasks/main.yml | 2 +- roles/edpm_libvirt/tasks/install.yml | 2 +- roles/edpm_logrotate_crond/tasks/install.yml | 2 +- roles/edpm_network_config/tasks/main.yml | 2 +- roles/edpm_network_config/tasks/network_config.yml | 2 +- roles/edpm_nvmeof/tasks/install.yml | 2 +- roles/edpm_ovs/tasks/download_cache.yml | 2 +- roles/edpm_ovs/tasks/install.yml | 2 +- roles/edpm_podman/tasks/install.yml | 2 +- roles/edpm_reboot/tasks/main.yaml | 2 +- roles/edpm_sshd/tasks/install.yml | 2 +- roles/edpm_telemetry/tasks/exporter.yml | 4 ++-- roles/edpm_tuned/tasks/main.yml | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index 7062d1bb6..3fa905692 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -42,7 +42,7 @@ name: osp.edpm.edpm_kernel tags: - edpm_kernel - when: not bootc + when: not ansible_local.bootc - name: Import edpm_tuned ansible.builtin.import_role: name: osp.edpm.edpm_tuned @@ -54,11 +54,11 @@ tasks_from: kernelargs.yml tags: - edpm_kernel - when: not bootc + when: not ansible_local.bootc - name: Configure KSM for kernel ansible.builtin.import_role: name: osp.edpm.edpm_kernel tasks_from: ksm.yml tags: - edpm_kernel - when: not bootc + when: not ansible_local.bootc diff --git a/roles/edpm_bootstrap/tasks/bootstrap.yml b/roles/edpm_bootstrap/tasks/bootstrap.yml index 8a32403c1..6014a7196 100644 --- a/roles/edpm_bootstrap/tasks/bootstrap.yml +++ b/roles/edpm_bootstrap/tasks/bootstrap.yml @@ -23,14 +23,14 @@ - name: Include packages tasks ansible.builtin.include_tasks: packages.yml - when: not bootc + when: not ansible_local.bootc - name: Import common post packages tasks ansible.builtin.import_tasks: bootstrap-common-post-packages.yml - name: Include swap tasks ansible.builtin.include_tasks: swap.yml - when: not bootc + when: not ansible_local.bootc - name: Import FIPS tasks ansible.builtin.import_tasks: fips.yml diff --git a/roles/edpm_bootstrap/tasks/main.yml b/roles/edpm_bootstrap/tasks/main.yml index a374207b0..bd5fe19b7 100644 --- a/roles/edpm_bootstrap/tasks/main.yml +++ b/roles/edpm_bootstrap/tasks/main.yml @@ -20,7 +20,7 @@ - name: Include download_cache tasks ansible.builtin.include_tasks: download_cache.yml - when: not bootc + when: not ansible_local.bootc - name: Import bootstrap tasks ansible.builtin.import_tasks: bootstrap.yml diff --git a/roles/edpm_kernel/tasks/main.yml b/roles/edpm_kernel/tasks/main.yml index 67c91a296..325affa8b 100644 --- a/roles/edpm_kernel/tasks/main.yml +++ b/roles/edpm_kernel/tasks/main.yml @@ -27,7 +27,7 @@ register: _install_packages_result when: - edpm_kernel_extra_packages | length > 0 - - not bootc + - not ansible_local.bootc until: _install_packages_result is succeeded retries: "{{ edpm_kernel_download_retries }}" delay: "{{ edpm_kernel_download_delay }}" diff --git a/roles/edpm_libvirt/tasks/install.yml b/roles/edpm_libvirt/tasks/install.yml index fdc8eeeb7..a936bfed6 100644 --- a/roles/edpm_libvirt/tasks/install.yml +++ b/roles/edpm_libvirt/tasks/install.yml @@ -13,7 +13,7 @@ delay: "{{ edpm_libvirt_download_delay }}" notify: - Restart libvirt - when: not bootc + when: not ansible_local.bootc - name: Ensure monolithic libvirt and tcp socket activation is not enabled or running tags: diff --git a/roles/edpm_logrotate_crond/tasks/install.yml b/roles/edpm_logrotate_crond/tasks/install.yml index 99550767d..8121f9136 100644 --- a/roles/edpm_logrotate_crond/tasks/install.yml +++ b/roles/edpm_logrotate_crond/tasks/install.yml @@ -24,7 +24,7 @@ retries: "{{ edpm_logrotate_crond_download_retries }}" delay: "{{ edpm_logrotate_crond_download_delay }}" when: - - not bootc + - not ansible_local.bootc - name: Gather SELinux fact if needed when: diff --git a/roles/edpm_network_config/tasks/main.yml b/roles/edpm_network_config/tasks/main.yml index 98a0bf154..22a86779e 100644 --- a/roles/edpm_network_config/tasks/main.yml +++ b/roles/edpm_network_config/tasks/main.yml @@ -17,7 +17,7 @@ - name: Configure network with network role from system roles [nmstate] when: - edpm_network_config_tool == 'nmstate' - - not bootc + - not ansible_local.bootc become: true block: - name: Install OVS NetworkManager plugin [nmstate] diff --git a/roles/edpm_network_config/tasks/network_config.yml b/roles/edpm_network_config/tasks/network_config.yml index ca6a6bb8d..5992a207c 100644 --- a/roles/edpm_network_config/tasks/network_config.yml +++ b/roles/edpm_network_config/tasks/network_config.yml @@ -47,7 +47,7 @@ until: edpm_network_config_onc_download is succeeded retries: "{{ edpm_network_config_download_retries }}" delay: "{{ edpm_network_config_download_delay }}" - when: not bootc + when: not ansible_local.bootc - name: Ensure /var/lib/edpm-config directory exists become: true diff --git a/roles/edpm_nvmeof/tasks/install.yml b/roles/edpm_nvmeof/tasks/install.yml index baca6bff2..e7621359b 100644 --- a/roles/edpm_nvmeof/tasks/install.yml +++ b/roles/edpm_nvmeof/tasks/install.yml @@ -29,4 +29,4 @@ ansible.builtin.package: name: nvme-cli state: present - when: not bootc + when: not ansible_local.bootc diff --git a/roles/edpm_ovs/tasks/download_cache.yml b/roles/edpm_ovs/tasks/download_cache.yml index 3feeed401..e07f5a819 100644 --- a/roles/edpm_ovs/tasks/download_cache.yml +++ b/roles/edpm_ovs/tasks/download_cache.yml @@ -9,4 +9,4 @@ until: _install_packages_result is succeeded retries: "{{ edpm_ovs_download_retries }}" delay: "{{ edpm_ovs_download_delay }}" - when: not bootc + when: not ansible_local.bootc diff --git a/roles/edpm_ovs/tasks/install.yml b/roles/edpm_ovs/tasks/install.yml index fb5e56d10..535c485ea 100644 --- a/roles/edpm_ovs/tasks/install.yml +++ b/roles/edpm_ovs/tasks/install.yml @@ -11,7 +11,7 @@ until: edpm_ovs_package_install is succeeded retries: "{{ edpm_ovs_download_retries }}" delay: "{{ edpm_ovs_download_delay }}" - when: not bootc + when: not ansible_local.bootc - name: Ensure ovs services are enabled and running tags: diff --git a/roles/edpm_podman/tasks/install.yml b/roles/edpm_podman/tasks/install.yml index eebe46da6..0a09ae039 100644 --- a/roles/edpm_podman/tasks/install.yml +++ b/roles/edpm_podman/tasks/install.yml @@ -25,7 +25,7 @@ until: edpm_podman_package_download is succeeded retries: "{{ edpm_podman_download_retries }}" delay: "{{ edpm_podman_download_delay }}" - when: not bootc + when: not ansible_local.bootc - name: Ensure we get the ansible interfaces facts when: diff --git a/roles/edpm_reboot/tasks/main.yaml b/roles/edpm_reboot/tasks/main.yaml index 8b5d3c7b0..3df54acba 100644 --- a/roles/edpm_reboot/tasks/main.yaml +++ b/roles/edpm_reboot/tasks/main.yaml @@ -18,7 +18,7 @@ become: true ansible.builtin.dnf: name: yum-utils - when: not bootc + when: not ansible_local.bootc - name: Check if reboot is required with needs-restarting ansible.builtin.command: needs-restarting -r diff --git a/roles/edpm_sshd/tasks/install.yml b/roles/edpm_sshd/tasks/install.yml index d3439d6ae..981a19b08 100644 --- a/roles/edpm_sshd/tasks/install.yml +++ b/roles/edpm_sshd/tasks/install.yml @@ -27,7 +27,7 @@ retries: "{{ edpm_sshd_download_retries }}" delay: "{{ edpm_sshd_download_delay }}" when: - - not bootc + - not ansible_local.bootc # NOTE(mwhahaha): we need this here because in order to validate our generated # config, we need to ensure the host keys exist diff --git a/roles/edpm_telemetry/tasks/exporter.yml b/roles/edpm_telemetry/tasks/exporter.yml index 8da0ce2c7..62df92607 100644 --- a/roles/edpm_telemetry/tasks/exporter.yml +++ b/roles/edpm_telemetry/tasks/exporter.yml @@ -18,14 +18,14 @@ edpm_container_manage_healthcheck_disabled: true edpm_container_manage_config_patterns: "{{ exporter }}.json" edpm_container_manage_clean_orphans: false - when: not bootc + when: not ansible_local.bootc - name: Restart exporter container become: true ansible.builtin.systemd: state: restarted name: "edpm_{{ exporter }}.service" - when: not bootc + when: not ansible_local.bootc - name: Deploy exporter container - bootc ansible.builtin.systemd_service: diff --git a/roles/edpm_tuned/tasks/main.yml b/roles/edpm_tuned/tasks/main.yml index 2b2f63b0d..c381ea5ae 100644 --- a/roles/edpm_tuned/tasks/main.yml +++ b/roles/edpm_tuned/tasks/main.yml @@ -17,7 +17,7 @@ - name: Install packages ansible.builtin.include_tasks: install.yml - when: not bootc + when: not ansible_local.bootc - name: Configure tuned ansible.builtin.include_tasks: configure.yml