From 0df6fe52fff9a9aa8b616dbef2ecc8a2ed83b869 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Wed, 17 Oct 2018 16:56:26 +0200
Subject: [PATCH] Remove with_items from apt
---
dhcp-server/tasks/main.yml | 7 +++----
mrtg/tasks/main.yml | 4 +---
mrtg/tasks/weathermap.yml | 22 ++++++++++++----------
networkd/tasks/main.yml | 7 +++----
radius-server/tasks/main.yml | 17 ++++++++---------
5 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/dhcp-server/tasks/main.yml b/dhcp-server/tasks/main.yml
index ada84b9..0ac61a4 100644
--- a/dhcp-server/tasks/main.yml
+++ b/dhcp-server/tasks/main.yml
@@ -3,11 +3,10 @@
- name: ensure we have the necessary packages
apt:
- name: "{{ item }}"
+ name:
+ - dnsmasq
+ - dnsmasq-utils
state: present
- with_items:
- - dnsmasq
- - dnsmasq-utils
tags:
- dhcp-server
diff --git a/mrtg/tasks/main.yml b/mrtg/tasks/main.yml
index 8f88e6e..72bb369 100644
--- a/mrtg/tasks/main.yml
+++ b/mrtg/tasks/main.yml
@@ -2,9 +2,7 @@
# file: shared-roles/network/mrtg
- name: ensure mrtg is installed
- apt: name="{{item}}" state=present
- with_items:
- - mrtg
+ apt: name=mrtg state=present
tags: mrtg
- name: ensure there is a group
diff --git a/mrtg/tasks/weathermap.yml b/mrtg/tasks/weathermap.yml
index c86d8a6..4ee13f6 100644
--- a/mrtg/tasks/weathermap.yml
+++ b/mrtg/tasks/weathermap.yml
@@ -2,19 +2,21 @@
# file: shared-roles/network/mrtg/tasks/weathermap.yml
- name: ensure we can get nice graph layouts
- apt: name="{{item}}" state=present
- with_items:
- - python-pygraphviz
- - python-numpy
+ apt:
+ name:
+ - python-pygraphviz
+ - python-numpy
+ state: present
tags: weathermap
- name: enable unpacking zip files and executing rotten php stuff
- apt: name="{{item}}" state=present
- with_items:
- - unzip
- - php-cli
- - php-pear
- - php-gd
+ apt:
+ name:
+ - unzip
+ - php-cli
+ - php-pear
+ - php-gd
+ state: present
tags: weathermap
- name: install rotten php requirements
diff --git a/networkd/tasks/main.yml b/networkd/tasks/main.yml
index d7b4445..40fd3ae 100644
--- a/networkd/tasks/main.yml
+++ b/networkd/tasks/main.yml
@@ -14,11 +14,10 @@
block:
- name: ensure the network packages are installed
apt:
- name: "{{ item }}"
+ name:
+ - vlan
+ - bridge-utils
state: present
- with_items:
- - vlan
- - bridge-utils
- name: ensure bond module is loaded
modprobe:
name: 8021q
diff --git a/radius-server/tasks/main.yml b/radius-server/tasks/main.yml
index a8655b6..1bf1e3d 100644
--- a/radius-server/tasks/main.yml
+++ b/radius-server/tasks/main.yml
@@ -2,16 +2,15 @@
- name: ensure freeradius server is installed
apt:
- name: "{{ item }}"
+ name:
+ - freeradius
+ - freeradius-config
+ - freeradius-ldap
+ - freeradius-mysql
+ - freeradius-postgresql
+ - freeradius-utils
+ - winbind
state: present
- with_items:
- - freeradius
- - freeradius-config
- - freeradius-ldap
- - freeradius-mysql
- - freeradius-postgresql
- - freeradius-utils
- - winbind
tags:
- radius-server
- packages
--
GitLab