fix: loop cosmetics and verbose outputs
This commit is contained in:
parent
75ca524808
commit
a5e773a007
@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
- name: Display nfs_client role
|
- name: Display nfs_client role
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
var: base_config
|
var: role_config
|
||||||
|
verbosity: 0
|
||||||
vars:
|
vars:
|
||||||
base_config:
|
role_config:
|
||||||
nfs_mounts: "{{ nfs_mounts }}"
|
nfs_mounts: "{{ nfs_mounts }}"
|
||||||
tasks:
|
tasks:
|
||||||
- Ensure nfs-client packages are installed
|
- Ensure nfs-client packages are installed
|
||||||
|
|||||||
@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
- name: Display os_base role
|
- name: Display os_base role
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
var: base_config
|
var: role_config
|
||||||
|
verbosity: 1
|
||||||
vars:
|
vars:
|
||||||
base_config:
|
role_config:
|
||||||
system_accounts: "{{ system_accounts }}"
|
system_accounts: "{{ system_accounts }}"
|
||||||
system_packages: "{{ system_packages }}"
|
system_packages: "{{ system_packages }}"
|
||||||
tasks:
|
tasks:
|
||||||
@ -29,6 +30,8 @@
|
|||||||
loop:
|
loop:
|
||||||
- wheel
|
- wheel
|
||||||
- sudo
|
- sudo
|
||||||
|
loop_control:
|
||||||
|
label: "Install package: {{ item }}"
|
||||||
|
|
||||||
- name: Create users
|
- name: Create users
|
||||||
user:
|
user:
|
||||||
@ -37,26 +40,33 @@
|
|||||||
groups: "{{ item.groups | default([]) }}"
|
groups: "{{ item.groups | default([]) }}"
|
||||||
state: "{{ item.state | default('present') }}"
|
state: "{{ item.state | default('present') }}"
|
||||||
shell: "{{ item.shell | default('/bin/bash') }}"
|
shell: "{{ item.shell | default('/bin/bash') }}"
|
||||||
system: "{{ item.system | default(False) }}"
|
system: "{{ _system }}"
|
||||||
comment: "{{ item.comment | default(omit) }}"
|
comment: "{{ item.comment | default(omit) }}"
|
||||||
createhome: true
|
createhome: true
|
||||||
home: "{{ item.home | default('/home/' + item.name ) }}"
|
home: "{{ item.home | default('/home/' + item.name ) }}"
|
||||||
uid: "{{ item.uid | default(omit) }}"
|
uid: "{{ item.uid | default(omit) }}"
|
||||||
loop: "{{ system_accounts }}"
|
loop: "{{ system_accounts }}"
|
||||||
|
loop_control:
|
||||||
|
label: "Create {{ _system | ternary('system', 'regular') }} user: {{ item.name }} ({{ item.uid }}, {{item.comment|d('No comments')}}"
|
||||||
|
vars:
|
||||||
|
_system: "{{ item.system | default(False) }}"
|
||||||
|
|
||||||
- name: Deploy all ssh keys
|
- name: Deploy all ssh keys
|
||||||
ansible.posix.authorized_key:
|
ansible.posix.authorized_key:
|
||||||
user: "{{ user_name }}"
|
user: "{{ _user_name }}"
|
||||||
state: "{{ sshkey_state }}"
|
state: "{{ _sshkey_state }}"
|
||||||
key: "{{ sshkey }}"
|
key: "{{ _sshkey }}"
|
||||||
follow: true
|
follow: true
|
||||||
path: "{{ home_dir }}/.ssh/authorized_keys"
|
path: "{{ _home_dir }}/.ssh/authorized_keys"
|
||||||
loop: "{{ system_accounts|selectattr('sshkeys', 'defined') | subelements('sshkeys') }}"
|
loop: "{{ system_accounts|selectattr('sshkeys', 'defined') | subelements('sshkeys') }}"
|
||||||
|
loop_control:
|
||||||
|
label: "Deploy '{{ _user_name }}' public key: {{ _sshkey_comment }}"
|
||||||
vars:
|
vars:
|
||||||
user_name: "{{ item.0.name }}"
|
_user_name: "{{ item.0.name }}"
|
||||||
home_dir: "{{ item.0.home | default('/home/' + item.0.name ) }}"
|
_home_dir: "{{ item.0.home | default('/home/' + item.0.name ) }}"
|
||||||
sshkey_state: "{{ item.0.sshkey_state | default('present') }}"
|
_sshkey_state: "{{ item.0.sshkey_state | default('present') }}"
|
||||||
sshkey: "{{ item.1 }}"
|
_sshkey: "{{ item.1 }}"
|
||||||
|
_sshkey_comment: "{{ _sshkey | split(' ') | last }}"
|
||||||
|
|
||||||
|
|
||||||
# Configure package manager
|
# Configure package manager
|
||||||
@ -73,6 +83,8 @@
|
|||||||
- name: 02-suggest
|
- name: 02-suggest
|
||||||
content: |
|
content: |
|
||||||
APT::Install-Suggests "{{ system_packages_nosuggest | bool | ternary(0, 1) }}";
|
APT::Install-Suggests "{{ system_packages_nosuggest | bool | ternary(0, 1) }}";
|
||||||
|
loop_control:
|
||||||
|
label: "Ensure APT preference: {{ item.content }}"
|
||||||
|
|
||||||
- name: Install base tools
|
- name: Install base tools
|
||||||
package:
|
package:
|
||||||
@ -98,6 +110,8 @@
|
|||||||
groups:
|
groups:
|
||||||
- sudo
|
- sudo
|
||||||
with_items: "{{ system_accounts }}"
|
with_items: "{{ system_accounts }}"
|
||||||
|
loop_control:
|
||||||
|
label: "Add user to sudo group: {{ item.name }}"
|
||||||
when: "'sudo' in perm"
|
when: "'sudo' in perm"
|
||||||
vars:
|
vars:
|
||||||
perm: "{{ item.permissions | default([]) }}"
|
perm: "{{ item.permissions | default([]) }}"
|
||||||
|
|||||||
@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
- name: Display os_disks role
|
- name: Display os_disks role
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
var: disk_config
|
var: role_config
|
||||||
|
verbosity: 0
|
||||||
vars:
|
vars:
|
||||||
disk_config:
|
role_config:
|
||||||
disks_vg: "{{ disks_vg }}"
|
disks_vg: "{{ disks_vg }}"
|
||||||
disks_lv: "{{ disks_lv }}"
|
disks_lv: "{{ disks_lv }}"
|
||||||
tasks:
|
tasks:
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
- name: Display os_systemd_networkd role
|
- name: Display os_systemd_networkd role
|
||||||
ansible.builtin.debug:
|
ansible.builtin.debug:
|
||||||
var: role_config
|
var: role_config
|
||||||
|
verbosity: 1
|
||||||
vars:
|
vars:
|
||||||
role_config:
|
role_config:
|
||||||
systemd_networkd_conf_directory: "{{ systemd_networkd_conf_directory }}"
|
systemd_networkd_conf_directory: "{{ systemd_networkd_conf_directory }}"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user