Skip to content

Commit a090201

Browse files
committed
Skip package install when using bootc
Signed-off-by: Brendan Shephard <[email protected]> dnf yum-utils Signed-off-by: Brendan Shephard <[email protected]> nvme-package Signed-off-by: Brendan Shephard <[email protected]>
1 parent c7cc7ed commit a090201

File tree

17 files changed

+23
-2
lines changed

17 files changed

+23
-2
lines changed

roles/edpm_kernel/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ edpm_nova_compute_config_dir: /var/lib/config-data/ansible-generated/nova_libvir
3636

3737
# KSM control
3838
edpm_kernel_enable_ksm: false
39+
edpm_use_bootc: false

roles/edpm_kernel/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
name: "{{ edpm_kernel_extra_packages }}"
2626
state: present
2727
register: _install_packages_result
28-
when: edpm_kernel_extra_packages | length > 0
28+
when:
29+
- edpm_kernel_extra_packages | length > 0
30+
- not edpm_use_bootc
2931
until: _install_packages_result is succeeded
3032
retries: "{{ edpm_kernel_download_retries }}"
3133
delay: "{{ edpm_kernel_download_delay }}"

roles/edpm_libvirt/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,4 @@ edpm_libvirt_password_path: /var/lib/openstack/configs/{{ edpm_libvirt_service_n
7272
# certs
7373
edpm_libvirt_tls_certs_enabled: "{{ edpm_tls_certs_enabled | default(False) }}"
7474
edpm_libvirt_tls_cert_src_dir: /var/lib/openstack/certs/{{ edpm_libvirt_service_name }}/default
75+
edpm_use_bootc: false

roles/edpm_libvirt/tasks/install.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
delay: "{{ edpm_libvirt_download_delay }}"
1414
notify:
1515
- Restart libvirt
16+
when: not edpm_use_bootc
1617

1718
- name: Ensure monolithic libvirt and tcp socket activation is not enabled or running
1819
tags:

roles/edpm_logrotate_crond/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,4 @@ edpm_logrotate_crond_dateformat: null
6666
edpm_logrotate_crond_dateyesterday: null
6767
# If container health check should be enabled
6868
edpm_logrotate_crond_healthcheck: true
69+
edpm_use_bootc: false

roles/edpm_logrotate_crond/tasks/install.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
until: edpm_logrotate_crond_cronie_package_download is succeeded
2424
retries: "{{ edpm_logrotate_crond_download_retries }}"
2525
delay: "{{ edpm_logrotate_crond_download_delay }}"
26+
when:
27+
- not edpm_use_bootc
2628

2729
- name: Gather SELinux fact if needed
2830
when:

roles/edpm_network_config/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ edpm_network_config_safe_defaults: true
5151
edpm_network_config_template: ""
5252
edpm_bond_interface_ovs_options: "bond_mode=active-backup"
5353
edpm_dns_search_domains: []
54+
edpm_use_bootc: false

roles/edpm_network_config/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
# under the License.
1616

1717
- name: Configure network with network role from system roles [nmstate]
18-
when: edpm_network_config_tool == 'nmstate'
18+
when:
19+
- edpm_network_config_tool == 'nmstate'
20+
- not edpm_use_bootc
1921
become: true
2022
block:
2123
- name: Install OVS NetworkManager plugin [nmstate]

roles/edpm_network_config/tasks/network_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
until: edpm_network_config_onc_download is succeeded
4848
retries: "{{ edpm_network_config_download_retries }}"
4949
delay: "{{ edpm_network_config_download_delay }}"
50+
when: not edpm_use_bootc
5051

5152
- name: Ensure /var/lib/edpm-config directory exists
5253
become: true

roles/edpm_nvmeof/tasks/install.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@
2929
ansible.builtin.package:
3030
name: nvme-cli
3131
state: present
32+
when: not edpm_use_bootc

0 commit comments

Comments
 (0)