Compare commits

...

4 Commits

3 changed files with 11 additions and 6 deletions

View File

@@ -9,6 +9,6 @@
| list | list
}} }}
ansible.builtin.command: >- ansible.builtin.command: >-
pacstrap /mnt {{ bootstrap_archlinux_packages | join(' ') }} --asexplicit pacstrap /mnt {{ bootstrap_archlinux_packages | join(' ') }}
register: bootstrap_result register: bootstrap_result
changed_when: bootstrap_result.rc == 0 changed_when: bootstrap_result.rc == 0

View File

@@ -29,7 +29,6 @@ bootstrap_rhel:
- standard - standard
extra: extra:
- bind-utils - bind-utils
- dhcp-client
- efibootmgr - efibootmgr
- glibc-langpack-de - glibc-langpack-de
- glibc-langpack-en - glibc-langpack-en
@@ -48,6 +47,7 @@ bootstrap_rhel:
{{ {{
(['grub2-efi-x64'] if os_version_major | default('') == '8' else ['grub2-efi']) (['grub2-efi-x64'] if os_version_major | default('') == '8' else ['grub2-efi'])
+ (['grub2-tools-extra'] if os_version_major | default('') in ['8', '9'] else []) + (['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']) + (['python39'] if os_version_major | default('') == '8' else ['python'])
+ (['kernel'] if os_version_major | default('') == '10' else []) + (['kernel'] if os_version_major | default('') == '10' else [])
+ (['zram-generator'] if os_version_major | default('') in ['9', '10'] else []) + (['zram-generator'] if os_version_major | default('') in ['9', '10'] else [])
@@ -62,12 +62,12 @@ bootstrap_almalinux:
- core - core
extra: extra:
- bind-utils - bind-utils
- dhcp-client
- efibootmgr - efibootmgr
- glibc-langpack-de - glibc-langpack-de
- glibc-langpack-en - glibc-langpack-en
- grub2 - grub2
- grub2-efi - grub2-efi
- kernel
- lrzsz - lrzsz
- lvm2 - lvm2
- mtr - mtr
@@ -86,6 +86,7 @@ bootstrap_almalinux:
conditional: >- conditional: >-
{{ {{
(['dbus-daemon'] if (os_version_major | default('10') | int) >= 9 else []) (['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 + bootstrap_common_conditional
}} }}
@@ -97,12 +98,12 @@ bootstrap_rocky:
- core - core
extra: extra:
- bind-utils - bind-utils
- dhcp-client
- efibootmgr - efibootmgr
- glibc-langpack-de - glibc-langpack-de
- glibc-langpack-en - glibc-langpack-en
- grub2 - grub2
- grub2-efi - grub2-efi
- kernel
- lrzsz - lrzsz
- lvm2 - lvm2
- mtr - mtr
@@ -121,7 +122,11 @@ bootstrap_rocky:
- wget - wget
- zram-generator - zram-generator
- zstd - zstd
conditional: "{{ bootstrap_common_conditional }}" conditional: >-
{{
(['dhcp-client'] if (os_version_major | default('9') | int) < 10 else [])
+ bootstrap_common_conditional
}}
bootstrap_fedora: bootstrap_fedora:
repos: repos:

View File

@@ -2,7 +2,7 @@
- name: Copy NetworkManager keyfile per interface - name: Copy NetworkManager keyfile per interface
vars: vars:
configuration_iface: "{{ item }}" configuration_iface: "{{ item }}"
configuration_iface_name: "{{ item.name | default('') }}" configuration_iface_name: "{{ item.name | default(configuration_detected_interfaces[idx] | default('')) }}"
configuration_net_uuid: "{{ ('LAN-' ~ idx ~ '-' ~ hostname) | ansible.builtin.to_uuid }}" configuration_net_uuid: "{{ ('LAN-' ~ idx ~ '-' ~ hostname) | ansible.builtin.to_uuid }}"
ansible.builtin.template: ansible.builtin.template:
src: network.j2 src: network.j2