crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

[unattended] fixup

merge-requests/353/merge
_shirenn 2022-12-22 10:57:36 +01:00
parent d13f1107dd
commit cfc780d90f
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
host_vars/ptf.adm.crans.org.yml
View File

@ -10,12 +10,6 @@ loc_unattended:
loc_needrestart: loc_needrestart:
override: [] override: []
loc_unattended:
reboot: true
loc_needrestart:
override: []
loc_nfs_mount: loc_nfs_mount:
mounts: mounts:
- ip: "{{ query('ldap', 'ip4', 'tealc', 'san') }}" - ip: "{{ query('ldap', 'ip4', 'tealc', 'san') }}"

4
plays/utilities.yml
View File

@ -4,9 +4,13 @@
vars: vars:
root: "{{ glob_root | default({}) | combine(loc_root | default({})) }}" root: "{{ glob_root | default({}) | combine(loc_root | default({})) }}"
ntp_client: "{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}" ntp_client: "{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}"
needrestart: "{{ glob_needrestart | default({}) | combine(loc_needrestart | default({})) }}"
unattended: "{{ glob_unattended | default({}) | combine(loc_unattended | default({})) }}"
roles: roles:
- root - root
- common-tools - common-tools
- sudo - sudo
- ntp-client - ntp-client
- root-config - root-config
- needrestart
- unattended-upgrades

2
roles/unattended-upgrades/templates/apt/apt.conf.d/50unattended-upgrades.j2
View File

@ -87,7 +87,7 @@ Unattended-Upgrade::Remove-Unused-Dependencies "true";
// Automatically reboot *WITHOUT CONFIRMATION* if // Automatically reboot *WITHOUT CONFIRMATION* if
// the file /var/run/reboot-required is found after the upgrade // the file /var/run/reboot-required is found after the upgrade
Unattended-Upgrade::Automatic-Reboot "{{ unattended.automatic_reboot | default(false) | ternary("true", "false") }}"; Unattended-Upgrade::Automatic-Reboot "{{ unattended.reboot | default(false) | ternary("true", "false") }}";
// Automatically reboot even if there are users currently logged in // Automatically reboot even if there are users currently logged in
// when Unattended-Upgrade::Automatic-Reboot is set to true // when Unattended-Upgrade::Automatic-Reboot is set to true