all: rewrite deprecated apt-with-items

freifunkh · Nov 13, 2018 · fb1a8af · fb1a8af
1 parent ea57d77
commit fb1a8af
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 21 deletions.
diff --git a/roles/cli_tools/tasks/main.yml b/roles/cli_tools/tasks/main.yml
@@ -1,8 +1,11 @@
 ---
 
 - name: Install cli tools
-  apt: name={{ item }} update_cache=yes
-  with_items:
+  apt:
+    update_cache: yes
+    name: "{{ packages }}"
+  vars:
+    packages:
     - netcat-openbsd
     - tcpdump
     - nmap

diff --git a/roles/dns_zonenodes/tasks/main.yml b/roles/dns_zonenodes/tasks/main.yml
@@ -1,8 +1,11 @@
 ---
 
 - name: Install dependencies (perl, libjson-perl, libnet-ip-perl, python-netaddr)
-  apt: name={{ item }} update_cache=yes
-  with_items:
+  apt: 
+    update_cache: yes
+    name: "{{ packages }}"
+  vars:
+    packages:
     - perl
     - libjson-perl
     - git 

diff --git a/roles/foswiki/tasks/main.yml b/roles/foswiki/tasks/main.yml
@@ -1,8 +1,11 @@
 ---
 
 - name: Install Foswiki dependencies
-  apt: name={{ item }} update_cache=yes
-  with_items:
+  apt: 
+    update_cache: yes
+    name: "{{ packages }}"
+  vars:
+    packages:
     - tar
     - unzip
     - perl

diff --git a/roles/gatemon/tasks/main.yml b/roles/gatemon/tasks/main.yml
@@ -1,8 +1,11 @@
 ---
 
 - name: Install gatemon dependencies
-  apt: name={{ item }} update_cache=yes
-  with_items:
+  apt:
+    name: "{{ packages }}"
+    update_cache: yes
+  vars:
+    packages:
     - monitoring-plugins-basic
     - monitoring-plugins-standard
     - nagios-plugins-contrib
@@ -17,7 +20,6 @@
     path: /usr/lib/gatemon
   register: gatemon_path
 
-
 - name: Clone gatemon sources
   git:
     repo: https://github.com/freifunkh/gatemon.git

diff --git a/roles/git_autoupdate/tasks/main.yml b/roles/git_autoupdate/tasks/main.yml
@@ -1,8 +1,11 @@
 ---
 
 - name: Install dependencies (git, sudo)
-  apt: name={{ item }} update_cache=yes
-  with_items:
+  apt:
+    update_cache: yes
+    name: "{{ packages }}"
+  vars:
+    packages:
     - git
     - sudo
 

diff --git a/roles/mesh_announce/tasks/main.yml b/roles/mesh_announce/tasks/main.yml
@@ -2,10 +2,11 @@
 
 - name: Install python3, lsb-release, ethtool, git
   apt:
-    name: "{{ item }}"
     update_cache: yes
     cache_valid_time: 3600
-  with_items:
+    name: "{{ packages }}"
+  vars:
+    packages:
     - python3
     - lsb-release
     - ethtool

diff --git a/roles/mesh_batman/tasks/build_from_source.yml b/roles/mesh_batman/tasks/build_from_source.yml
@@ -2,9 +2,10 @@
 
 - name: Add build dependencies
   apt:
-    name: "{{ item }}"
     update_cache: yes
-  with_items:
+    name: "{{ packages }}"
+  vars:
+    packages:
     - dkms
     - git
     - linux-headers-amd64

diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
@@ -27,9 +27,10 @@
 
 - name: Remove old nginx
   apt:
-    name: "{{ item }}"
     state: absent
-  with_items:
+    name: "{{ packages }}"
+  vars:
+    packages:
     - nginx=1.6.*
     - nginx-common=1.6.*
 

diff --git a/roles/node_exporter/tasks/bpfcountd.yml b/roles/node_exporter/tasks/bpfcountd.yml
@@ -2,9 +2,10 @@
 
 - name: Install build dependencies
   apt:
-    name: "{{ item }}"
     update_cache: yes
-  with_items: 
+    name: "{{ packages }}"
+  vars:
+    packages:
     - build-essential
     - libpcap-dev
     - git

diff --git a/roles/stats_batches/tasks/main.yml b/roles/stats_batches/tasks/main.yml
@@ -2,8 +2,13 @@
 
 - name: Install dependencies
   apt: name={{ item }}
-  update_cache: yes
-  with_items: ["git", "curl", "netcat-openbsd"]
+    name: "{{ packages }}"
+    update_cache: yes
+  vars:
+    packages:
+    - git
+    - curl
+    - netcat-openbsd
 
 - name: Create auto user
   register: createuser