Use local fact for bootc

bshephar · bshephar · commit 52a93f9f8da0 · 2025-01-20T11:05:05.000+10:00
Signed-off-by: Brendan Shephard &lt;bshephar@redhat.com&gt;
diff --git 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_container_manage/tasks/shutdown.yml b/roles/edpm_container_manage/tasks/shutdown.yml
@@ -27,7 +27,7 @@
       loop:
         - 'edpm-container-shutdown'
         - 'edpm-start-podman-container'
-      when: not edpm_use_bootc
+      when: not ansible_local.bootc
 
     - name: "Create systemd preset dir"
       ansible.builtin.file:
diff --git 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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/configure.yml b/roles/edpm_telemetry/tasks/configure.yml
@@ -139,4 +139,4 @@
     name: edpm-compute@ceilometer_agent_compute
     state: started
     enabled: true
-  when: bootc
+  when: ansible_local.bootc
diff --git 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
@@ -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
