Compare commits
2
Commits
96220d424e
...
5a43c9a29e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a43c9a29e | ||
|
|
9cc0c704a7 |
@@ -206,6 +206,7 @@ bootstrap_debian:
|
||||
- openssh-server
|
||||
- python3
|
||||
- xfsprogs
|
||||
- xz-utils
|
||||
extra:
|
||||
- bat
|
||||
- curl
|
||||
@@ -258,6 +259,7 @@ bootstrap_ubuntu:
|
||||
- openssh-server
|
||||
- python3
|
||||
- xfsprogs
|
||||
- xz-utils
|
||||
extra:
|
||||
- bash-completion
|
||||
- bat
|
||||
|
||||
@@ -35,10 +35,12 @@
|
||||
}, recursive=True)
|
||||
}}
|
||||
|
||||
# Keyed on os, not hostname: inventories set hostname themselves, and doing so
|
||||
# would otherwise skip enrichment and leave os undefined for validation.
|
||||
- name: Check if pre-computed system_cfg needs enrichment
|
||||
when: system_cfg is defined
|
||||
ansible.builtin.set_fact:
|
||||
_bootstrap_needs_enrichment: "{{ hostname is not defined }}"
|
||||
_bootstrap_needs_enrichment: "{{ os is not defined }}"
|
||||
|
||||
- name: Merge pre-computed system_cfg with bootstrap system_defaults
|
||||
when:
|
||||
|
||||
@@ -317,7 +317,7 @@
|
||||
_autologin: "{{ system_cfg.features.desktop.autologin | default(false) }}"
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- _autologin is boolean and not _autologin or (_autologin is string and _autologin | length > 0 and _autologin in system_cfg.users)
|
||||
- _autologin is boolean and not _autologin or (_autologin is string and _autologin | length > 0 and _autologin in system_cfg.users | map(attribute='name'))
|
||||
fail_msg: >-
|
||||
desktop.autologin must be false or a username string present in
|
||||
system.users; got '{{ _autologin }}'. Bool true is not accepted - the
|
||||
@@ -355,14 +355,12 @@
|
||||
|
||||
- name: Validate at least one user with a password is defined
|
||||
vars:
|
||||
_pw_users: "{{ system_cfg.users | dict2items | selectattr('value.password', 'defined') | list }}"
|
||||
_pw_users: "{{ system_cfg.users | selectattr('password', 'defined') | map(attribute='password') | map('string') | reject('equalto', '') | list }}"
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- system_cfg.users | default({}) | length > 0
|
||||
- system_cfg.users | default([]) | length > 0
|
||||
- _pw_users | length > 0
|
||||
- _pw_users[0].key | string | length > 0
|
||||
- _pw_users[0].value.password | string | length > 0
|
||||
fail_msg: "At least one user with a password must be defined in system.users."
|
||||
fail_msg: "At least one user with a non-empty password must be defined in system.users."
|
||||
quiet: true
|
||||
no_log: true
|
||||
|
||||
|
||||
Reference in New Issue
Block a user