fix merge conflict in CHANGELOG

CHANGELOG.md

@@ -9,6 +9,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 - **BREAKING** CentOS7: Introduce `wireguard_centos7_kernel_plus_reboot` and `wireguard_centos7_standard_reboot` variables. Both are set to "true" by default. This will cause the host to be rebooted in case the "wireguard" kernel module was installed the very first time. If `wireguard_centos7_installation_method: "kernel-plus"` is set and the host wasn't booted with a `kernel-plus` kernel already you most probably need to reboot. For the `standard` kernel this might not be needed.
 - CentOS7: Add reboot to the standard mode to make sure the WireGuard kernel module is available (contribution by @mofelee)
+- introduce `wireguard_update_cache` variable to control if package manager caches should be updated before the installation (contribution by @sebix)
+- variable `wireguard_ubuntu_update_cache` is deprecated and will be removed in the next release
 
 ## 13.0.1
 

README.md

@@ -137,6 +137,9 @@ wireguard_interface_restart: false
 # course a very sensitive value you might consider a tool like Ansible Vault
 # to store it encrypted.
 # wireguard_private_key:
+
+# Set to "false" if package cache should not be updated
+wireguard_update_cache: "true"
 ```
 
 There are also a few Linux distribution specific settings:
@@ -148,8 +151,9 @@ There are also a few Linux distribution specific settings:
 # - elementary OS
 #######################################
 
-# Set to "false" if package cache should not be updated
+# Set to "false" if package cache should not be updated.
-wireguard_ubuntu_update_cache: "true"
+# DEPRECATED: This variable will be removed with the next major release. Please use "wireguard_update_cache" instead.
+wireguard_ubuntu_update_cache: "{{ wireguard_update_cache }}"
 
 # Set package cache valid time
 wireguard_ubuntu_cache_valid_time: "3600"

defaults/main.yml

@@ -74,7 +74,9 @@ wireguard_interface_restart: false
 #######################################
 
 # Set to "false" if package cache should not be updated
-wireguard_ubuntu_update_cache: "true"
+wireguard_update_cache: "true"
+# DEPRECATED: This variable will be removed with the next major release. Please use "wireguard_update_cache" instead.
+wireguard_ubuntu_update_cache: "{{ wireguard_update_cache }}"
 
 # Set package cache valid time
 wireguard_ubuntu_cache_valid_time: "3600"

tasks/setup-almalinux-8.yml

@@ -7,7 +7,7 @@
     name:
       - epel-release
       - elrepo-release
-    update_cache: true
+    update_cache: "{{ wireguard_update_cache }}"
 
 - name: (AlmaLinux 8) Ensure WireGuard DKMS package is removed
   ansible.builtin.yum:

tasks/setup-centos-7.yml

@@ -11,12 +11,12 @@
         name:
           - epel-release
           - https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm
-        update_cache: true
+        update_cache: "{{ wireguard_update_cache }}"
 
     - name: (CentOS 7) Install yum-plugin-elrepo
       ansible.builtin.yum:
         name: yum-plugin-elrepo
-        update_cache: true
+        update_cache: "{{ wireguard_update_cache }}"
 
     - name: (CentOS 7) Install WireGuard packages
       ansible.builtin.yum:
@@ -48,7 +48,7 @@
         name:
           - epel-release
           - yum-utils
-        update_cache: true
+        update_cache: "{{ wireguard_update_cache }}"
 
     - name: (CentOS 7 - kernel-plus) Enable CentosPlus repo
       ansible.builtin.command: yum-config-manager --setopt=centosplus.includepkgs=kernel-plus --enablerepo=centosplus --save

tasks/setup-debian-pve-guest-variant.yml

@@ -6,7 +6,7 @@
   ansible.builtin.apt_repository:
     repo: "deb http://deb.debian.org/debian buster-backports main"
     state: "{{ 'present' if (ansible_distribution_version | int <= 10) else 'absent' }}"
-    update_cache: true
+    update_cache: "{{ wireguard_update_cache }}"
 
 - name: (Proxmox lxc) Install wireguard-tools.
   ansible.builtin.apt:

tasks/setup-debian-pve-host-variant.yml

@@ -8,7 +8,7 @@
   ansible.builtin.apt_repository:
     repo: "deb http://deb.debian.org/debian buster-backports main"
     state: "{{ 'present' if (ansible_distribution_version | int <= 10) else 'absent' }}"
-    update_cache: true
+    update_cache: "{{ wireguard_update_cache }}"
 
 - name: (Proxmox) Install kernel headers for the currently running kernel to compile WireGuard with DKMS
   ansible.builtin.apt:

tasks/setup-debian-raspbian-buster.yml

@@ -27,7 +27,7 @@
   ansible.builtin.apt_repository:
     repo: "deb http://deb.debian.org/debian buster-backports main"
     state: present
-    update_cache: true
+    update_cache: "{{ wireguard_update_cache }}"
 
 - name: (Raspbian) Install latest kernel
   ansible.builtin.apt:

tasks/setup-debian-vanilla.yml

@@ -8,3 +8,4 @@
     name:
       - "wireguard"
     state: present
+    update_cache: "{{ wireguard_update_cache }}"

tasks/setup-rocky-8.yml

@@ -11,7 +11,7 @@
         name:
           - epel-release
           - elrepo-release
-        update_cache: true
+        update_cache: "{{ wireguard_update_cache }}"
 
     - name: (Rocky Linux 8) Ensure WireGuard DKMS package is removed
       ansible.builtin.yum:
@@ -40,7 +40,7 @@
       ansible.builtin.yum:
         name:
           - epel-release
-        update_cache: true
+        update_cache: "{{ wireguard_update_cache }}"
 
     - name: (Rocky Linux 8) Ensure WireGuard KMOD package is removed
       ansible.builtin.yum: