fix(bootstrap): move Jinja to end of task name and rename registers to bootstrap_dnf_*
This commit is contained in:
@@ -1,41 +1,32 @@
|
|||||||
---
|
---
|
||||||
- name: "Bootstrap {{ os | capitalize }}"
|
- name: "Bootstrap {{ os | capitalize }}"
|
||||||
vars:
|
vars:
|
||||||
_dnf_os_config:
|
_dnf_config: "{{ lookup('vars', bootstrap_var_key) }}"
|
||||||
rocky:
|
_dnf_repos: "{{ _dnf_config.repos | map('regex_replace', '^', '--repo=') | join(' ') }}"
|
||||||
repos: [baseos, appstream]
|
_dnf_groups: "{{ _dnf_config.base | join(' ') }}"
|
||||||
groups: [core]
|
|
||||||
almalinux:
|
|
||||||
repos: [baseos, appstream]
|
|
||||||
groups: [core]
|
|
||||||
fedora:
|
|
||||||
repos: [fedora, fedora-updates]
|
|
||||||
groups: [critical-path-base, core]
|
|
||||||
_dnf_repos: "{{ _dnf_os_config[os].repos | map('regex_replace', '^', '--repo=') | join(' ') }}"
|
|
||||||
_dnf_groups: "{{ _dnf_os_config[os].groups | join(' ') }}"
|
|
||||||
_dnf_extra: >-
|
_dnf_extra: >-
|
||||||
{{
|
{{
|
||||||
lookup('vars', bootstrap_var_key)
|
((_dnf_config.extra | default([])) + (_dnf_config.conditional | default([])))
|
||||||
| reject('equalto', '')
|
| reject('equalto', '')
|
||||||
| join(' ')
|
| join(' ')
|
||||||
}}
|
}}
|
||||||
block:
|
block:
|
||||||
- name: "Install {{ os | capitalize }} base system"
|
- name: "Install base system for {{ os | capitalize }}"
|
||||||
ansible.builtin.command: >-
|
ansible.builtin.command: >-
|
||||||
dnf --releasever={{ os_version }} --best {{ _dnf_repos }}
|
dnf --releasever={{ os_version }} --best {{ _dnf_repos }}
|
||||||
--installroot=/mnt --setopt=install_weak_deps=False
|
--installroot=/mnt --setopt=install_weak_deps=False
|
||||||
groupinstall -y {{ _dnf_groups }}
|
groupinstall -y {{ _dnf_groups }}
|
||||||
register: _dnf_base_result
|
register: bootstrap_dnf_base_result
|
||||||
changed_when: _dnf_base_result.rc == 0
|
changed_when: bootstrap_dnf_base_result.rc == 0
|
||||||
|
|
||||||
- name: Install extra packages
|
- name: Install extra packages
|
||||||
ansible.builtin.command: >-
|
ansible.builtin.command: >-
|
||||||
{{ chroot_command }} dnf --releasever={{ os_version }} --setopt=install_weak_deps=False
|
{{ chroot_command }} dnf --releasever={{ os_version }} --setopt=install_weak_deps=False
|
||||||
install -y {{ _dnf_extra }}
|
install -y {{ _dnf_extra }}
|
||||||
register: _dnf_extra_result
|
register: bootstrap_dnf_extra_result
|
||||||
changed_when: _dnf_extra_result.rc == 0
|
changed_when: bootstrap_dnf_extra_result.rc == 0
|
||||||
|
|
||||||
- name: Reinstall kernel core
|
- name: Reinstall kernel core
|
||||||
ansible.builtin.command: "{{ chroot_command }} dnf reinstall -y kernel-core"
|
ansible.builtin.command: "{{ chroot_command }} dnf reinstall -y kernel-core"
|
||||||
register: _dnf_kernel_result
|
register: bootstrap_dnf_kernel_result
|
||||||
changed_when: _dnf_kernel_result.rc == 0
|
changed_when: bootstrap_dnf_kernel_result.rc == 0
|
||||||
|
|||||||
Reference in New Issue
Block a user