feat: update apt upgrade tasks to conditionally refresh cache based on apt_update variable

This commit is contained in:
2026-08-07 11:43:28 +02:00
parent 6ba7c61cb7
commit c4acc32add
8 changed files with 14 additions and 7 deletions
@@ -238,6 +238,11 @@ cron_user_special_time_entries:
cron_user_entries: cron_user_entries:
- name: "Check load on thi machine"
minute: '*/5'
hour: '*'
job: /root/bin/monitoring/check_webservice_load.sh
- name: "Check if SSH service is running. Restart service if needed." - name: "Check if SSH service is running. Restart service if needed."
minute: '*/5' minute: '*/5'
hour: '*' hour: '*'
@@ -29,7 +29,7 @@
- name: apt upgrade - name: apt upgrade
apt: apt:
upgrade: "{{ apt_upgrade_type }}" upgrade: "{{ apt_upgrade_type }}"
update_cache: true update_cache: "{{ not (apt_update | default(true) | bool) }}"
dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}" dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
when: apt_upgrade|bool when: apt_upgrade|bool
tags: tags:
@@ -32,7 +32,7 @@
- name: apt upgrade - name: apt upgrade
apt: apt:
upgrade: "{{ apt_upgrade_type }}" upgrade: "{{ apt_upgrade_type }}"
update_cache: true update_cache: "{{ not (apt_update | default(true) | bool) }}"
dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}" dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
when: apt_upgrade|bool when: apt_upgrade|bool
tags: tags:
@@ -56,7 +56,7 @@
- name: Upgrade packages - name: Upgrade packages
ansible.builtin.apt: ansible.builtin.apt:
upgrade: "{{ apt_upgrade_type | default('safe') }}" upgrade: "{{ apt_upgrade_type | default('safe') }}"
update_cache: true update_cache: "{{ not (apt_update | default(true) | bool) }}"
dpkg_options: "{{ (apt_upgrade_dpkg_options | default(['force-confdef','force-confold'])) | join(',') }}" dpkg_options: "{{ (apt_upgrade_dpkg_options | default(['force-confdef','force-confold'])) | join(',') }}"
when: (apt_upgrade | default(false)) | bool when: (apt_upgrade | default(false)) | bool
tags: [ansible-dependencies] tags: [ansible-dependencies]
@@ -32,7 +32,7 @@
- name: apt upgrade - name: apt upgrade
apt: apt:
upgrade: "{{ apt_upgrade_type }}" upgrade: "{{ apt_upgrade_type }}"
update_cache: true update_cache: "{{ not (apt_update | default(true) | bool) }}"
dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}" dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
when: apt_upgrade|bool when: apt_upgrade|bool
tags: tags:
+1 -1
View File
@@ -32,7 +32,7 @@
- name: apt upgrade - name: apt upgrade
apt: apt:
upgrade: "{{ apt_upgrade_type }}" upgrade: "{{ apt_upgrade_type }}"
update_cache: true update_cache: "{{ not (apt_update | default(true) | bool) }}"
dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}" dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
when: apt_upgrade|bool when: apt_upgrade|bool
tags: tags:
+3 -1
View File
@@ -196,7 +196,9 @@
- name: (apt.yml) apt upgrade - name: (apt.yml) apt upgrade
ansible.builtin.apt: ansible.builtin.apt:
upgrade: "{{ apt_upgrade_type }}" upgrade: "{{ apt_upgrade_type }}"
update_cache: true # Cache refresh happens in the apt update task above.
# Keep fallback refresh only if apt_update is disabled.
update_cache: "{{ not (apt_update | bool) }}"
dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}" dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
when: apt_upgrade|bool when: apt_upgrade|bool
tags: tags:
+1 -1
View File
@@ -28,7 +28,7 @@
- name: (caching-nameserver.yml) upgrade - name: (caching-nameserver.yml) upgrade
ansible.builtin.apt: ansible.builtin.apt:
upgrade: "{{ apt_upgrade_type }}" upgrade: "{{ apt_upgrade_type }}"
update_cache: true update_cache: "{{ not (apt_update | bool) }}"
dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}" dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
when: when:
- ansible_facts["distribution"] == "Debian" - ansible_facts["distribution"] == "Debian"