diff --git a/roles/edpm_kernel/defaults/main.yml b/roles/edpm_kernel/defaults/main.yml index b100a8cc4..5fe8791b3 100644 --- a/roles/edpm_kernel/defaults/main.yml +++ b/roles/edpm_kernel/defaults/main.yml @@ -36,4 +36,3 @@ edpm_nova_compute_config_dir: /var/lib/config-data/ansible-generated/nova_libvir # KSM control edpm_kernel_enable_ksm: false -edpm_use_bootc: false diff --git a/roles/edpm_kernel/tasks/main.yml b/roles/edpm_kernel/tasks/main.yml index 05179ab88..67c91a296 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 edpm_use_bootc + - not bootc until: _install_packages_result is succeeded retries: "{{ edpm_kernel_download_retries }}" delay: "{{ edpm_kernel_download_delay }}" diff --git a/roles/edpm_libvirt/defaults/main.yml b/roles/edpm_libvirt/defaults/main.yml index 4ba010d6e..90c75966d 100644 --- a/roles/edpm_libvirt/defaults/main.yml +++ b/roles/edpm_libvirt/defaults/main.yml @@ -72,4 +72,3 @@ edpm_libvirt_password_path: /var/lib/openstack/configs/{{ edpm_libvirt_service_n # certs edpm_libvirt_tls_certs_enabled: "{{ edpm_tls_certs_enabled | default(False) }}" edpm_libvirt_tls_cert_src_dir: /var/lib/openstack/certs/{{ edpm_libvirt_service_name }}/default -edpm_use_bootc: false diff --git a/roles/edpm_libvirt/tasks/install.yml b/roles/edpm_libvirt/tasks/install.yml index d168de985..fdc8eeeb7 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 edpm_use_bootc + when: not bootc - name: Ensure monolithic libvirt and tcp socket activation is not enabled or running tags: diff --git a/roles/edpm_logrotate_crond/defaults/main.yml b/roles/edpm_logrotate_crond/defaults/main.yml index 8d599d109..c055a4922 100644 --- a/roles/edpm_logrotate_crond/defaults/main.yml +++ b/roles/edpm_logrotate_crond/defaults/main.yml @@ -66,4 +66,3 @@ edpm_logrotate_crond_dateformat: null edpm_logrotate_crond_dateyesterday: null # If container health check should be enabled edpm_logrotate_crond_healthcheck: true -edpm_use_bootc: false diff --git a/roles/edpm_logrotate_crond/tasks/install.yml b/roles/edpm_logrotate_crond/tasks/install.yml index acd56e2d4..99550767d 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 edpm_use_bootc + - not bootc - name: Gather SELinux fact if needed when: diff --git a/roles/edpm_network_config/defaults/main.yml b/roles/edpm_network_config/defaults/main.yml index 0ef798bdd..d5266db7b 100644 --- a/roles/edpm_network_config/defaults/main.yml +++ b/roles/edpm_network_config/defaults/main.yml @@ -51,4 +51,3 @@ edpm_network_config_safe_defaults: true edpm_network_config_template: "" edpm_bond_interface_ovs_options: "bond_mode=active-backup" edpm_dns_search_domains: [] -edpm_use_bootc: false diff --git a/roles/edpm_network_config/tasks/main.yml b/roles/edpm_network_config/tasks/main.yml index 984402a7b..98a0bf154 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 edpm_use_bootc + - not 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 25a7e78b5..ca6a6bb8d 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 edpm_use_bootc + when: not 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 544df7be8..baca6bff2 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 edpm_use_bootc + when: not bootc diff --git a/roles/edpm_ovs/defaults/main.yml b/roles/edpm_ovs/defaults/main.yml index 4cd2231bf..2d03e647f 100644 --- a/roles/edpm_ovs/defaults/main.yml +++ b/roles/edpm_ovs/defaults/main.yml @@ -37,4 +37,3 @@ edpm_ovs_packages: - openvswitch # whether to reload the openvswitch service after an update is complete edpm_ovs_reload_after_update: false -edpm_use_bootc: false diff --git a/roles/edpm_ovs/tasks/download_cache.yml b/roles/edpm_ovs/tasks/download_cache.yml index a7da2fd71..3feeed401 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 edpm_use_bootc + when: not bootc diff --git a/roles/edpm_ovs/tasks/install.yml b/roles/edpm_ovs/tasks/install.yml index 9ff08dd89..fb5e56d10 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 edpm_use_bootc + when: not bootc - name: Ensure ovs services are enabled and running tags: diff --git a/roles/edpm_podman/defaults/main.yml b/roles/edpm_podman/defaults/main.yml index a85079a3f..20b4ac60a 100644 --- a/roles/edpm_podman/defaults/main.yml +++ b/roles/edpm_podman/defaults/main.yml @@ -103,4 +103,3 @@ edpm_podman_auth_file: ~/.config/containers/auth.json edpm_podman_registries_conf: "" edpm_podman_disconnected_ocp: false -edpm_use_bootc: false diff --git a/roles/edpm_podman/tasks/install.yml b/roles/edpm_podman/tasks/install.yml index 35d920154..eebe46da6 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 edpm_use_bootc + when: not 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 ba22c8ee1..8b5d3c7b0 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 edpm_use_bootc + when: not 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 fdcf98411..d3439d6ae 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 edpm_use_bootc + - not bootc # NOTE(mwhahaha): we need this here because in order to validate our generated # config, we need to ensure the host keys exist