Support bootc

playbooks/bootstrap.yml

@@ -42,6 +42,7 @@
         name: osp.edpm.edpm_kernel
       tags:
         - edpm_kernel
+      when: not ansible_local.bootc
     - name: Import edpm_tuned
       ansible.builtin.import_role:
         name: osp.edpm.edpm_tuned
@@ -53,9 +54,11 @@
         tasks_from: kernelargs.yml
       tags:
         - edpm_kernel
+      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 ansible_local.bootc

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

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

roles/edpm_container_manage/tasks/shutdown.yml

@@ -27,17 +27,25 @@
       loop:
         - 'edpm-container-shutdown'
         - 'edpm-start-podman-container'
-    - name: "Create /usr/lib/systemd/system/edpm-container-shutdown.service"
+      when: not edpm_use_bootc
+
+    - name: "Create systemd preset dir"
+      ansible.builtin.file:
+        state: "directory"
+        path: "/etc/systemd/system-preset"
+        mode: 0644
+
+    - name: "Create /etc/systemd/system/edpm-container-shutdown.service"
       ansible.builtin.copy:
         src: "{{ role_path }}/files/edpm-container-shutdown-service"
-        dest: "/usr/lib/systemd/system/edpm-container-shutdown.service"
+        dest: "/etc/systemd/system/edpm-container-shutdown.service"
         mode: '0644'
         owner: root
         group: root
-    - name: "Create /usr/lib/systemd/system-preset/91-edpm-container-shutdown.preset"
+    - name: "Create /etc/systemd/system-preset/91-edpm-container-shutdown.preset"
       ansible.builtin.copy:
         src: "{{ role_path }}/files/91-edpm-container-shutdown-preset"
-        dest: "/usr/lib/systemd/system-preset/91-edpm-container-shutdown.preset"
+        dest: "/etc/systemd/system-preset/91-edpm-container-shutdown.preset"
         mode: '0644'
         owner: root
         group: root
@@ -47,17 +55,17 @@
         state: started
         enabled: true
         daemon_reload: true
-    - name: "Create /usr/lib/systemd/system/netns-placeholder.service"
+    - name: "Create /etc/systemd/system/netns-placeholder.service"
       ansible.builtin.copy:
         src: "{{ role_path }}/files/netns-placeholder-service"
-        dest: "/usr/lib/systemd/system/netns-placeholder.service"
+        dest: "/etc/systemd/system/netns-placeholder.service"
         mode: '0644'
         owner: root
         group: root
-    - name: "Create /usr/lib/systemd/system-preset/91-netns-placeholder.preset"
+    - name: "Create /etc/systemd/system-preset/91-netns-placeholder.preset"
       ansible.builtin.copy:
         src: "{{ role_path }}/files/91-netns-placeholder-preset"
-        dest: "/usr/lib/systemd/system-preset/91-netns-placeholder.preset"
+        dest: "/etc/systemd/system-preset/91-netns-placeholder.preset"
         mode: '0644'
         owner: root
         group: root

roles/edpm_iscsid/tasks/run.yml

@@ -24,15 +24,12 @@
     file: healthchecks.yml
 
 - name: Manage iscsid containers
-  ansible.builtin.include_role:
-    name: edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: iscsid
-    edpm_container_standalone_container_defs:
-      iscsid: "{{ lookup('template', 'iscsid.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      iscsid: "{{ lookup('file', 'files/iscsid.yaml') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@iscsid
+    enabled: true
+    state: started
   register: manage_iscsid_stat
+  become: true
 
 - name: Check if the iscsid container restart is required
   ansible.builtin.stat:
@@ -52,7 +49,7 @@
     - not manage_iscsid_stat.changed|bool
     - iscsi_restart_stat.stat.exists|bool
   ansible.builtin.systemd:
-    name: edpm_iscsid
+    name: edpm-compute@iscsid
     state: restarted
 
 - name: Remove iscsid container restart sentinel file

roles/edpm_kernel/tasks/main.yml

@@ -25,7 +25,9 @@
         name: "{{ edpm_kernel_extra_packages }}"
         state: present
       register: _install_packages_result
-      when: edpm_kernel_extra_packages | length > 0
+      when: 
+      - edpm_kernel_extra_packages | length > 0
+      - not ansible_local.bootc
       until: _install_packages_result is succeeded
       retries: "{{ edpm_kernel_download_retries }}"
       delay: "{{ edpm_kernel_download_delay }}"

roles/edpm_libvirt/tasks/install.yml

@@ -13,6 +13,7 @@
   delay: "{{ edpm_libvirt_download_delay }}"
   notify:
     - Restart libvirt
+  when: not ansible_local.bootc
 
 - name: Ensure monolithic libvirt and tcp socket activation is not enabled or running
   tags:

roles/edpm_logrotate_crond/tasks/configure.yml

@@ -17,9 +17,15 @@
 - name: Configure tmpwatch on the host
   become: true
   block:
+    - name: Create /var/lib/openstack/cron
+      ansible.builtin.file:
+        path: "/var/lib/openstack/cron"
+        mode: 0644
+        state: directory
+
     - name: Push script
       ansible.builtin.copy:
-        dest: /usr/local/sbin/containers-tmpwatch
+        dest: /var/lib/openstack/cron/containers-tmpwatch
         owner: root
         group: root
         mode: "0755"

roles/edpm_logrotate_crond/tasks/install.yml

@@ -23,6 +23,8 @@
   until: edpm_logrotate_crond_cronie_package_download is succeeded
   retries: "{{ edpm_logrotate_crond_download_retries }}"
   delay: "{{ edpm_logrotate_crond_download_delay }}"
+  when:
+  - not ansible_local.bootc
 
 - name: Gather SELinux fact if needed
   when:

roles/edpm_multipathd/tasks/run.yml

@@ -24,15 +24,12 @@
     file: healthchecks.yml
 
 - name: Manage multipathd containers
-  ansible.builtin.include_role:
-    name: edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: multipathd
-    edpm_container_standalone_container_defs:
-      multipathd: "{{ lookup('template', 'multipathd.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      multipathd: "{{ lookup('template', 'kolla_multipathd.yaml.j2') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@multipathd
+    enabled: true
+    state: started
   register: manage_multipathd_stat
+  become: true
 
 - name: Check if the multipathd container restart is required
   ansible.builtin.stat:

roles/edpm_network_config/tasks/main.yml

@@ -15,7 +15,9 @@
 # under the License.
 
 - name: Configure network with network role from system roles [nmstate]
-  when: edpm_network_config_tool == 'nmstate'
+  when: 
+  - edpm_network_config_tool == 'nmstate'
+  - not ansible_local.bootc
   become: true
   block:
     - name: Install OVS NetworkManager plugin [nmstate]

roles/edpm_network_config/tasks/network_config.yml

@@ -47,6 +47,7 @@
   until: edpm_network_config_onc_download is succeeded
   retries: "{{ edpm_network_config_download_retries }}"
   delay: "{{ edpm_network_config_download_delay }}"
+  when: not ansible_local.bootc
 
 - name: Ensure /var/lib/edpm-config directory exists
   become: true

roles/edpm_neutron_metadata/tasks/run.yml

@@ -37,11 +37,8 @@
     file: healthchecks.yml
 
 - name: Run ovn_metadata_agent container
-  ansible.builtin.include_role:
-    name: osp.edpm.edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: ovn_metadata_agent
-    edpm_container_standalone_container_defs:
-      ovn_metadata_agent: "{{ lookup('template', 'ovn_metadata_agent.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      ovn_metadata_agent: "{{ lookup('template', 'kolla_ovn_metadata_agent.yaml.j2') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@ovn_metadata_agent
+    enabled: true
+    state: started
+  become: true

roles/edpm_nvmeof/tasks/install.yml

@@ -29,3 +29,4 @@
   ansible.builtin.package:
     name: nvme-cli
     state: present
+  when: not ansible_local.bootc

roles/edpm_ovn/tasks/run.yml

@@ -37,11 +37,9 @@
     file: healthchecks.yml
 
 - name: Run ovn_controller container
-  ansible.builtin.include_role:
-    name: osp.edpm.edpm_container_standalone
-  vars:
-    edpm_container_standalone_service: ovn_controller
-    edpm_container_standalone_container_defs:
-      ovn_controller: "{{ lookup('template', 'ovn_controller.yaml.j2') | from_yaml }}"
-    edpm_container_standalone_kolla_config_files:
-      ovn_controller: "{{ lookup('template', 'kolla_ovn_controller.yaml.j2') | from_yaml }}"
+  ansible.builtin.systemd_service:
+    name: edpm-compute@ovn_controller
+    enabled: true
+    state: started
+  become: true
+

roles/edpm_ovs/tasks/download_cache.yml

@@ -9,3 +9,4 @@
   until: _install_packages_result is succeeded
   retries: "{{ edpm_ovs_download_retries }}"
   delay: "{{ edpm_ovs_download_delay }}"
+  when: not ansible_local.bootc

roles/edpm_ovs/tasks/install.yml

@@ -11,6 +11,7 @@
   until: edpm_ovs_package_install is succeeded
   retries: "{{ edpm_ovs_download_retries }}"
   delay: "{{ edpm_ovs_download_delay }}"
+  when: not ansible_local.bootc
 
 - name: Ensure ovs services are enabled and running
   tags:

roles/edpm_podman/tasks/install.yml

@@ -25,6 +25,7 @@
       until: edpm_podman_package_download is succeeded
       retries: "{{ edpm_podman_download_retries }}"
       delay: "{{ edpm_podman_download_delay }}"
+      when: not ansible_local.bootc
 
     - name: Ensure we get the ansible interfaces facts
       when:

roles/edpm_reboot/tasks/main.yaml

@@ -18,6 +18,7 @@
   become: true
   ansible.builtin.dnf:
     name: yum-utils
+  when: not ansible_local.bootc
 
 - name: Check if reboot is required with needs-restarting
   ansible.builtin.command: needs-restarting -r

roles/edpm_sshd/tasks/install.yml

@@ -26,6 +26,8 @@
       until: _sshd_install_result is succeeded
       retries: "{{ edpm_sshd_download_retries }}"
       delay: "{{ edpm_sshd_download_delay }}"
+      when:
+        - 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

roles/edpm_telemetry/tasks/configure.yml

@@ -133,3 +133,10 @@
         mode: "0644"
         owner: ceilometer
         group: ceilometer
+
+- name: Start ceilometer_agent_compute container - bootc
+  ansible.builtin.systemd_service:
+    name: edpm-compute@ceilometer_agent_compute
+    state: started
+    enabled: true
+  when: bootc

roles/edpm_telemetry/tasks/exporter.yml

@@ -18,9 +18,18 @@
     edpm_container_manage_healthcheck_disabled: true
     edpm_container_manage_config_patterns: "{{ exporter }}.json"
     edpm_container_manage_clean_orphans: false
+  when: not ansible_local.bootc
 
 - name: Restart exporter container
   become: true
   ansible.builtin.systemd:
     state: restarted
     name: "edpm_{{ exporter }}.service"
+  when: not ansible_local.bootc
+
+- name: Deploy exporter container - bootc
+  ansible.builtin.systemd_service:
+    name: edpm-compute@node_exporter
+    state: started
+    enabled: true
+

roles/edpm_tuned/tasks/main.yml

@@ -17,6 +17,7 @@
 
 - name: Install packages
   ansible.builtin.include_tasks: install.yml
+  when: not ansible_local.bootc
 
 - name: Configure tuned
   ansible.builtin.include_tasks: configure.yml