apt without with_items

9 files changed, 72 insertions, 85 deletions

diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 3c6fc790..f30cad66 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -6,30 +6,29 @@
 
 - name: install base system tools
   apt:
-    name: "{{ item }}"
+    name:
+    - htop
+    - dstat
+    - lsof
+    - gawk
+    - psmisc
+    - less
+    - debian-goodies
+    - screen
+    - mtr-tiny
+    - tcpdump
+    - iptraf-ng
+    - unp
+    - haveged
+    - dbus
+    - libpam-systemd
+    - aptitude
+    - ca-certificates
+    - file
+    - man-db
+    - manpages
+    - nano
     state: present
-  with_items:
-  - htop
-  - dstat
-  - lsof
-  - gawk
-  - psmisc
-  - less
-  - debian-goodies
-  - screen
-  - mtr-tiny
-  - tcpdump
-  - iptraf-ng
-  - unp
-  - haveged
-  - dbus
-  - libpam-systemd
-  - aptitude
-  - ca-certificates
-  - file
-  - man-db
-  - manpages
-  - nano
 
 - name: Remove startup message from screen
   lineinfile:
diff --git a/roles/hetzner-slim/tasks/main.yml b/roles/hetzner-slim/tasks/main.yml
index 81218085..a44ccdb5 100644
--- a/roles/hetzner-slim/tasks/main.yml
+++ b/roles/hetzner-slim/tasks/main.yml
@@ -1,10 +1,9 @@
 ---
 - name: remove useless packages
-  with_items:
-  - exim4
-  - exim4-daemon-light
   apt:
-    name: "{{ item }}"
+    name:
+    - exim4
+    - exim4-daemon-light
     state: absent
     purge: yes
 
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index cc3bc83a..e6aee41f 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -39,12 +39,11 @@
     filename: kubernetes
 
 - name: install basic kubernetes components
-  with_items:
-  - "kubelet{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
-  - "kubeadm{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
-  - "kubectl{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
   apt:
-    name: "{{ item }}"
+    name:
+    - "kubelet{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
+    - "kubeadm{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
+    - "kubectl{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
     state: present
 
 - name: disable automatic upgrades for kubernetes components
diff --git a/roles/prepare-dkms/tasks/default.yml b/roles/prepare-dkms/tasks/default.yml
index f3748feb..bff826ae 100644
--- a/roles/prepare-dkms/tasks/default.yml
+++ b/roles/prepare-dkms/tasks/default.yml
@@ -1,8 +1,7 @@
 ---
 - name: install kernel headers and dkms
-  with_items:
-#  - linux-headers-amd64    # TODO: fix this so it works for ubuntu(hwe) and debian
-  - dkms
   apt:
-    name: "{{ item }}"
+    name:
+    #  - linux-headers-amd64    # TODO: fix this so it works for ubuntu(hwe) and debian
+    - dkms
     state: present
diff --git a/roles/prepare-dkms/tasks/scaleway.yml b/roles/prepare-dkms/tasks/scaleway.yml
index 57626d15..82795e85 100644
--- a/roles/prepare-dkms/tasks/scaleway.yml
+++ b/roles/prepare-dkms/tasks/scaleway.yml
@@ -1,11 +1,10 @@
 ---
 - name: install build deps and dkms
-  with_items:
-  - build-essential
-  - libssl-dev
-  - dkms
   apt:
-    name: "{{ item }}"
+    name:
+    - build-essential
+    - libssl-dev
+    - dkms
     state: present
 
 - name: install (sadly missing) script to fetch kernel sources
diff --git a/roles/scaleway-slim/tasks/main.yml b/roles/scaleway-slim/tasks/main.yml
index 81218085..a44ccdb5 100644
--- a/roles/scaleway-slim/tasks/main.yml
+++ b/roles/scaleway-slim/tasks/main.yml
@@ -1,10 +1,9 @@
 ---
 - name: remove useless packages
-  with_items:
-  - exim4
-  - exim4-daemon-light
   apt:
-    name: "{{ item }}"
+    name:
+    - exim4
+    - exim4-daemon-light
     state: absent
     purge: yes
 
diff --git a/roles/ubuntu-ws/tasks/main.yml b/roles/ubuntu-ws/tasks/main.yml
index 7dd682c1..04300dbd 100644
--- a/roles/ubuntu-ws/tasks/main.yml
+++ b/roles/ubuntu-ws/tasks/main.yml
@@ -15,21 +15,20 @@
 
 - name: base packages
   apt:
-    name: "{{ item }}"
+    name:
+    - file
+    - pwgen
+    - p7zip-rar
+    - exfat-fuse
+    - exfat-utils
+    - ntfs-3g
+    - gnupg-curl
+    - pass
+    - evince
+    - geeqie
+    - file-roller
+    - cifs-utils
     state: present
-  with_items:
-  - file
-  - pwgen
-  - p7zip-rar
-  - exfat-fuse
-  - exfat-utils
-  - ntfs-3g
-  - gnupg-curl
-  - pass
-  - evince
-  - geeqie
-  - file-roller
-  - cifs-utils
 
 - name: install browser
   apt:
@@ -41,37 +40,34 @@
 
 - name: install multimedia stuff
   apt:
-    name: "{{ item }}"
+    name:
+    - vlc
+    - mpv
+    - ffmpeg
+    - pavumeter
+    - lame
+    - gstreamer1.0-pulseaudio
     state: present
-  with_items:
-  - vlc
-  - mpv
-  - ffmpeg
-  - pavumeter
-  - lame
-  - gstreamer1.0-pulseaudio
 
 - name: install restricted stuff
   apt:
-    name: "{{ item }}"
+    name:
+    - ubuntu-restricted-extras
+    - intel-microcode
     state: present
-  with_items:
-  - ubuntu-restricted-extras
-  - intel-microcode
 
 - name: remove superflous packages
   apt:
-    name: "{{ item }}"
+    name:
+    - gnome-software
+    - gnome-software-common
+    - software-properties-gtk
+    - software-properties-common
+    - python3-software-properties
+    - flashplugin-installer
     state: absent
     autoremove: yes
     purge: yes
-  with_items:
-  - gnome-software
-  - gnome-software-common
-  - software-properties-gtk
-  - software-properties-common
-  - python3-software-properties
-  - flashplugin-installer
 
 - name: install extra packages
   apt:
diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml
index a9d42b7b..11761c33 100644
--- a/roles/wireguard/tasks/main.yml
+++ b/roles/wireguard/tasks/main.yml
@@ -1,11 +1,10 @@
 ---
 - name: install wireguard packages
   apt:
-    name: "{{ item }}"
-    state: present
-  with_items:
+    name:
     - wireguard-dkms
     - wireguard-tools
+    state: present
 
 - name: check if module is available for the currently running kernel
   command: modprobe --dry-run wireguard
diff --git a/roles/zsh/tasks/main.yml b/roles/zsh/tasks/main.yml
index 12eac8c4..0ae54715 100644
--- a/roles/zsh/tasks/main.yml
+++ b/roles/zsh/tasks/main.yml
@@ -1,10 +1,8 @@
 ---
 - name: install zsh packages
   apt:
-    name: "{{ item }}"
+    name: zsh
     state: present
-  with_items:
-  - zsh
 
 - name: install zsh-config
   copy: