Merge pull request #1018 from slagle/bootc-merge

Merge bootc branch into main

Author: openshift-merge-bot[bot]

molecule/common/test_deps/defaults/main.yml

@@ -20,3 +20,5 @@ test_deps_setup_edpm: true
 test_deps_mirrors_file_path: /etc/ci/mirror_info.sh
 test_deps_setup_stream: true
 test_deps_setup_ceph: false
+# Value to use for the bootc fact
+test_deps_bootc_fact: false

molecule/common/test_deps/tasks/main.yml

@@ -153,3 +153,25 @@
         releasever: "{{ ansible_facts['distribution_major_version'] }}"
       when:
         - (test_deps_extra_packages | length) > 0
+
+- name: Bootc block
+  become: true
+  block:
+    - name: Check for /etc/ansible/facts.d/bootc.fact
+      stat:
+        path: /etc/ansible/facts.d/bootc.fact
+      register: bootc_fact_stat
+
+    - name: Create /etc/ansible/facts.d
+      file:
+        state: directory
+        path: /etc/ansible/facts.d
+        mode: 0755
+
+    - name: Create /etc/ansible/facts.d/bootc.fact
+      copy:
+        dest: /etc/ansible/facts.d/bootc.fact
+        content: |
+          #!/bin/bash
+          echo "{{ test_deps_bootc_fact | lower }}"
+        mode: 0755

playbooks/bootstrap.yml

@@ -15,6 +15,12 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
     - name: Grow volumes
       ansible.builtin.import_role:
         name: osp.edpm.edpm_growvols

playbooks/configure_network.yml

@@ -7,6 +7,13 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Import edpm_ovs to install ovs packages
       ansible.builtin.import_role:
         name: osp.edpm.edpm_ovs

playbooks/configure_os.yml

@@ -7,6 +7,13 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Configure edpm_podman
       ansible.builtin.import_role:
         name: osp.edpm.edpm_podman

playbooks/configure_ovs_dpdk.yml

@@ -5,11 +5,19 @@
   strategy: linear
   gather_facts: "{{ gather_facts | default(false) }}"
   tasks:
+    - name: Gather ansible_local facts
+      ansible.builtin.setup:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Install openvswitch package
       become: true
       ansible.builtin.dnf:
         name: openvswitch
         state: present
+      when: not ansible_local.bootc
 
     - name: Configure OvS DPDK configs
       ansible.builtin.import_role:

playbooks/download_cache.yml

@@ -7,6 +7,13 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Import edpm_download_cache
       ansible.builtin.import_role:
         name: osp.edpm.edpm_download_cache

playbooks/install_certs.yml

@@ -7,6 +7,13 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Install EDPM Certs
       ansible.builtin.import_role:
         name: osp.edpm.edpm_install_certs

playbooks/install_os.yml

@@ -7,6 +7,13 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Install edpm_podman
       ansible.builtin.import_role:
         name: osp.edpm.edpm_podman

playbooks/libvirt.yml

@@ -7,6 +7,13 @@
   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:
+        gather_subset:
+          - "!all"
+          - "!min"
+          - "local"
+
     - name: Deploy EDPM libvirt
       ansible.builtin.import_role:
         name: osp.edpm.edpm_libvirt