From 3f65585e5ca38d5ce6f2fb4cbe20fe8faca2a06e Mon Sep 17 00:00:00 2001 From: Sandwich Date: Sat, 21 Feb 2026 13:43:41 +0100 Subject: [PATCH] fix(bootstrap): make dhcp-client conditional for EL < 10 (removed in EL 10) --- roles/bootstrap/vars/main.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/roles/bootstrap/vars/main.yml b/roles/bootstrap/vars/main.yml index 45cf49b..0495c81 100644 --- a/roles/bootstrap/vars/main.yml +++ b/roles/bootstrap/vars/main.yml @@ -29,7 +29,6 @@ bootstrap_rhel: - standard extra: - bind-utils - - dhcp-client - efibootmgr - glibc-langpack-de - glibc-langpack-en @@ -48,6 +47,7 @@ bootstrap_rhel: {{ (['grub2-efi-x64'] if os_version_major | default('') == '8' else ['grub2-efi']) + (['grub2-tools-extra'] if os_version_major | default('') in ['8', '9'] else []) + + (['dhcp-client'] if (os_version_major | default('9') | int) < 10 else []) + (['python39'] if os_version_major | default('') == '8' else ['python']) + (['kernel'] if os_version_major | default('') == '10' else []) + (['zram-generator'] if os_version_major | default('') in ['9', '10'] else []) @@ -62,7 +62,6 @@ bootstrap_almalinux: - core extra: - bind-utils - - dhcp-client - efibootmgr - glibc-langpack-de - glibc-langpack-en @@ -87,6 +86,7 @@ bootstrap_almalinux: conditional: >- {{ (['dbus-daemon'] if (os_version_major | default('10') | int) >= 9 else []) + + (['dhcp-client'] if (os_version_major | default('10') | int) < 10 else []) + bootstrap_common_conditional }} @@ -98,7 +98,6 @@ bootstrap_rocky: - core extra: - bind-utils - - dhcp-client - efibootmgr - glibc-langpack-de - glibc-langpack-en @@ -123,7 +122,11 @@ bootstrap_rocky: - wget - zram-generator - zstd - conditional: "{{ bootstrap_common_conditional }}" + conditional: >- + {{ + (['dhcp-client'] if (os_version_major | default('9') | int) < 10 else []) + + bootstrap_common_conditional + }} bootstrap_fedora: repos: