Merge pull request #1033 from slagle/bootc-update

Move bootc update tasks to edpm_update_system

Author: openshift-merge-bot[bot]

roles/edpm_update/defaults/main.yml

@@ -31,7 +31,3 @@ edpm_update_exclude_packages:
   - openvswitch
 
 edpm_update_running_services: "{{ edpm_service_types }}"
-
-# The bootc container image is provided by the OpenStackVersion
-# CR using the bootcOsContainerImage parameter
-edpm_bootc_os_container_image: ""

roles/edpm_update/tasks/main.yml

@@ -39,8 +39,10 @@
     - ansible_local.bootc is not defined or not ansible_local.bootc
 
 - name: Update OS (bootc)
-  ansible.builtin.include_tasks: bootc.yml
-  when: ansible_local.bootc
+  ansible.builtin.import_role:
+    name: osp.edpm.edpm_update_system
+    tasks_from: bootc.yml
+  when: ansible_local is defined and ansible_local.bootc
 
 - name: Update containers
   ansible.builtin.include_tasks: containers.yml

roles/edpm_update_system/defaults/main.yml

@@ -29,3 +29,7 @@ edpm_update_system_include_packages:
 
 # List of packages to exclude from the update
 edpm_update_system_exclude_packages: []
+
+# The bootc container image is provided by the OpenStackVersion
+# CR using the bootcOsContainerImage parameter
+edpm_update_system_bootc_os_container_image: ""

roles/edpm_update/tasks/bootc.yml renamed to roles/edpm_update_system/tasks/bootc.yml

@@ -16,7 +16,25 @@
 
 
 - name: Update bootc image
-  ansible.builtin.shell: bootc switch "{{ edpm_bootc_os_container_image }}"
+  ansible.builtin.shell: bootc switch "{{ edpm_update_system_bootc_os_container_image }}"
   become: true
   register: bootc_result
   changed_when: bootc_result.rc != 0
+
+- name: Create directory required by edpm-reboot role
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/reboot_required/
+    state: directory
+    mode: "0755"
+  when:
+    - bootc_result.changed
+
+- name: Create required file to enforce a reboot
+  become: true
+  ansible.builtin.file:
+    path: /var/lib/openstack/reboot_required/bootc_reboot
+    state: touch
+    mode: "0600"
+  when:
+    - bootc_result.changed

roles/edpm_update_system/tasks/main.yml

@@ -36,7 +36,5 @@
     - ansible_local.bootc is not defined or not ansible_local.bootc
 
 - name: Update OS (bootc)
-  ansible.builtin.import_role:
-    name: osp.edpm.edpm_update
-    tasks_from: bootc.yml
+  ansible.builtin.include_tasks: bootc.yml
   when: ansible_local is defined and ansible_local.bootc