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

@@ -35,3 +35,57 @@
 - name: Import FIPS tasks
   ansible.builtin.import_tasks: fips.yml
   when: edpm_bootstrap_fips_mode != 'check'
+
+- name: Execute bootstrap command
+  ansible.builtin.import_tasks: bootstrap_command.yml
+
+- name: Import packages tasks
+  ansible.builtin.import_tasks: packages.yml
+  when: not ansible_local.bootc
+
+- name: Set selinux state
+  ansible.posix.selinux:
+    policy: targeted
+    state: "{{ edpm_bootstrap_selinux_mode }}"
+  become: true
+
+- name: Stop NetworkManager from updating resolv.conf
+  when: ( edpm_bootstrap_network_service == 'NetworkManager' ) and ( not edpm_bootstrap_network_resolvconf_update )
+  become: true
+  block:
+    - name: Set 'dns=none' in /etc/NetworkManager/NetworkManager.conf
+      community.general.ini_file:
+        path: /etc/NetworkManager/NetworkManager.conf
+        state: present
+        no_extra_spaces: true
+        section: main
+        option: dns
+        value: none
+        backup: true
+        mode: '0644'
+    - name: Set 'rc-manager=unmanaged' in /etc/NetworkManager/NetworkManager.conf
+      community.general.ini_file:
+        path: /etc/NetworkManager/NetworkManager.conf
+        state: present
+        no_extra_spaces: true
+        section: main
+        option: rc-manager
+        value: unmanaged
+        backup: true
+        mode: '0644'
+    - name: Reload NetworkManager
+      ansible.builtin.systemd:
+        name: NetworkManager
+        state: reloaded
+
+- name: Stop dhclient from updating resolv.conf
+  become: true
+  ansible.builtin.copy:
+    dest: /etc/dhcp/dhclient-enter-hooks
+    mode: "0755"
+    content: |
+      #!/bin/sh
+      make_resolv_conf() { : ; }
+
+- name: Configure swap
+  ansible.builtin.import_tasks: swap.yml

roles/edpm_bootstrap/tasks/packages.yml

@@ -65,6 +65,7 @@
 - name: Install and enable network service
   when:
     - (edpm_bootstrap_legacy_network_packages | length) > 0
+    - not ansible_local.bootc
   become: true
   block:
     - name: Deploy network-scripts required for deprecated network service

roles/edpm_bootstrap/tasks/swap.yml

@@ -16,6 +16,7 @@
 
 - name: Configure swap file
   when:
+    - not ansible_local.bootc
     - not edpm_bootstrap_swap_partition_enabled|bool
     - edpm_bootstrap_swap_size_megabytes|int > 0
   become: true

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 ansible_local.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

@@ -25,14 +25,32 @@
 
 - name: Manage iscsid containers
   ansible.builtin.include_role:
-    name: edpm_container_standalone
+     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 }}"
   register: manage_iscsid_stat
+  when: not ansible_local.bootc
+
+- name: Configure iscsid for bootc
+  when: ansible_local.bootc
+  become: true
+  block:
+  - name: Render kolla config file
+    ansible.builtin.template:
+      src: templates/iscsid.yaml.j2
+      dest: /var/lib/kolla/config_files/iscsid.json
+      mode: 0644
+
+  - name: Manage iscsid crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@iscsid
+      enabled: true
+      state: started
+    register: manage_iscsid_stat
 
 - name: Check if the iscsid container restart is required
   ansible.builtin.stat:
@@ -49,12 +67,23 @@
 - name: Restart iscsid container to refresh /etcd/iscsid.conf
   become: true
   when:
+    - not ansible_local.bootc
     - not manage_iscsid_stat.changed|bool
     - iscsi_restart_stat.stat.exists|bool
   ansible.builtin.systemd:
     name: edpm_iscsid
     state: restarted
 
+- name: Restart iscsid container to refresh /etcd/iscsid.conf
+  become: true
+  when:
+    - ansible_local.bootc
+    - not manage_iscsid_stat.changed|bool
+    - iscsi_restart_stat.stat.exists|bool
+  ansible.builtin.systemd:
+    name: edpm-compute@iscsid
+    state: restarted
+
 - name: Remove iscsid container restart sentinel file
   become: true
   ansible.builtin.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,25 @@
 - name: Configure tmpwatch on the host
   become: true
   block:
+    - name: Create /var/lib/openstack
+      ansible.builtin.file:
+        path: "/var/lib/openstack"
+        mode: 0755
+        state: directory
+        owner: "{{ ansible_user }}"
+        group: "{{ ansible_user }}"
+        setype: "container_file_t"
+
+    - name: Create /var/lib/openstack/cron
+      ansible.builtin.file:
+        path: "/var/lib/openstack/cron"
+        mode: 0644
+        state: directory
+        setype: "container_file_t"
+
     - 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_logrotate_crond/tasks/logrotate_crond.yml

@@ -24,3 +24,21 @@
       logrotate_crond: "{{ lookup('template', 'logrotate_crond.yaml.j2') | from_yaml }}"
     edpm_container_standalone_kolla_config_files:
       logrotate_crond: "{{ lookup('file', 'files/logrotate_crond.yaml') | from_yaml }}"
+  when: not ansible_local.bootc
+
+- name: Configure logrotate for bootc
+  when: ansible_local.bootc
+  block:
+  - name: Render kolla config file
+    ansible.builtin.copy:
+      src: files/logrotate_crond.yaml
+      dest: /var/lib/kolla/config_files/logrotate_crond.json
+      mode: 0644
+
+  - name: Manage logrotate crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@logrotate_crond
+      enabled: true
+      state: started
+    become: true
+

roles/edpm_logrotate_crond/tasks/run.yml

@@ -27,3 +27,20 @@
       logrotate_crond: "{{ lookup('template', 'logrotate_crond.yaml.j2') | from_yaml }}"
     edpm_container_standalone_kolla_config_files:
       logrotate_crond: "{{ lookup('file', 'files/logrotate_crond.yaml') | from_yaml }}"
+  when: not ansible_local.bootc
+
+- name: Configure logrotate for bootc
+  when: ansible_local.bootc
+  become: true
+  block:
+  - name: Render kolla config file
+    ansible.builtin.copy:
+      src: files/logrotate_crond.yaml
+      dest: /var/lib/kolla/config_files/logrotate_crond.json
+      mode: 0644
+
+  - name: Manage logrotate crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@logrotate_crond
+      enabled: true
+      state: started

roles/edpm_multipathd/tasks/run.yml

@@ -32,7 +32,24 @@
       multipathd: "{{ lookup('template', 'multipathd.yaml.j2') | from_yaml }}"
     edpm_container_standalone_kolla_config_files:
       multipathd: "{{ lookup('template', 'kolla_multipathd.yaml.j2') | from_yaml }}"
-  register: manage_multipathd_stat
+  when: not ansible_local.bootc
+
+- name: Configure multipathd for bootc
+  when: ansible_local.bootc
+  become: true
+  block:
+  - name: Render kolla config file
+    ansible.builtin.template:
+      src: templates/kolla_multipathd.yaml.j2
+      dest: /var/lib/kolla/config_files/multipathd.json
+      mode: 0644
+
+  - name: Manage logrotate crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@multipathd
+      enabled: true
+      state: started
+    register: manage_multipathd_stat
 
 - name: Check if the multipathd container restart is required
   ansible.builtin.stat:

roles/edpm_network_config/tasks/main.yml

@@ -15,7 +15,8 @@
 # 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'
   become: true
   block:
     - name: Install OVS NetworkManager plugin [nmstate]
@@ -26,11 +27,14 @@
       until: nm_ovs_status is succeeded
       retries: "{{ edpm_network_config_download_retries }}"
       delay: "{{ edpm_network_config_download_delay }}"
+      when: not ansible_local.bootc
     - name: Restart NetworkManager after plugin installation [nmstate]
       ansible.builtin.systemd:
         name: NetworkManager
         state: restarted
-      when: nm_ovs_status.changed  # noqa: no-handler
+      when: 
+        - nm_ovs_status.changed # noqa: no-handler
+        - not ansible_local.bootc
     - name: Render network_state variable
       ansible.builtin.set_fact:
         network_state: "{{ edpm_network_config_template | from_yaml }}"

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

@@ -45,3 +45,20 @@
       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 }}"
+  when: not ansible_local.bootc
+
+- name: Configure ovn_metadata_agent for bootc
+  when: ansible_local.bootc
+  become: true
+  block:
+  - name: Render kolla config file
+    ansible.builtin.template:
+      src: templates/kolla_ovn_metadata_agent.yaml.j2
+      dest: /var/lib/kolla/config_files/ovn_metadata_agent.json
+      mode: 0644
+
+  - name: Manage logrotate crond containers
+    ansible.builtin.systemd_service:
+      name: edpm-compute@ovn_metadata_agent
+      enabled: true
+      state: started