Skip to content

Commit cb156f0

Browse files
slagleclaude
andcommitted
Move bootc update tasks to edpm_update_system role
Moves bootc.yml from edpm_update to edpm_update_system role to better align with role responsibilities. The edpm_update_system role handles system-level updates, while edpm_update focuses on service updates. Changes: - Move roles/edpm_update/tasks/bootc.yml to roles/edpm_update_system/tasks/bootc.yml - Rename variable edpm_bootc_os_container_image to edpm_update_system_bootc_os_container_image - Update edpm_update role to import bootc tasks from edpm_update_system - Update edpm_update_system to use local bootc.yml tasks 🤖 Generated with [Claude Code](https://claude.com/claude-code) Jira: OSPRH-19238 Co-Authored-By: Claude <[email protected]> Signed-off-by: James Slagle <[email protected]>
1 parent c59a665 commit cb156f0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

roles/edpm_update/defaults/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,3 @@ edpm_update_exclude_packages:
3131
- openvswitch
3232

3333
edpm_update_running_services: "{{ edpm_service_types }}"
34-
35-
# The bootc container image is provided by the OpenStackVersion
36-
# CR using the bootcOsContainerImage parameter
37-
edpm_bootc_os_container_image: ""

roles/edpm_update/tasks/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@
3939
- ansible_local.bootc is not defined or not ansible_local.bootc
4040

4141
- name: Update OS (bootc)
42-
ansible.builtin.include_tasks: bootc.yml
43-
when: ansible_local.bootc
42+
ansible.builtin.import_role:
43+
name: osp.edpm.edpm_update_system
44+
tasks_from: bootc.yml
45+
when: ansible_local is defined and ansible_local.bootc
4446

4547
- name: Update containers
4648
ansible.builtin.include_tasks: containers.yml

roles/edpm_update_system/defaults/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ edpm_update_system_include_packages:
2929

3030
# List of packages to exclude from the update
3131
edpm_update_system_exclude_packages: []
32+
33+
# The bootc container image is provided by the OpenStackVersion
34+
# CR using the bootcOsContainerImage parameter
35+
edpm_update_system_bootc_os_container_image: ""

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
- name: Update bootc image
19-
ansible.builtin.shell: bootc switch "{{ edpm_bootc_os_container_image }}"
19+
ansible.builtin.shell: bootc switch "{{ edpm_update_system_bootc_os_container_image }}"
2020
become: true
2121
register: bootc_result
2222
changed_when: bootc_result.rc != 0
@@ -37,4 +37,4 @@
3737
state: touch
3838
mode: "0600"
3939
when:
40-
- bootc_result.changed
40+
- bootc_result.changed

roles/edpm_update_system/tasks/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,5 @@
3636
- ansible_local.bootc is not defined or not ansible_local.bootc
3737

3838
- name: Update OS (bootc)
39-
ansible.builtin.import_role:
40-
name: osp.edpm.edpm_update
41-
tasks_from: bootc.yml
39+
ansible.builtin.include_tasks: bootc.yml
4240
when: ansible_local is defined and ansible_local.bootc

0 commit comments

Comments
 (0)