diff --git a/dhcp-server/tasks/main.yml b/dhcp-server/tasks/main.yml index ada84b936aa7442657a99718aada49f3e93e0379..0ac61a4508594b17dd7c32e745a801f1cbfe4b1c 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 8f88e6eca672b37c1ecdedc3e0d3470767853405..72bb3693c1d1e1c1ebe63ce4ade25f1095a0baa3 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 c86d8a6f77394fe8e027eb0a762a54f1c81a6f9f..4ee13f675487f3f7223ab7c076f716fe50e96e72 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 d7b444566f8072bf251f2c736fcb97e59eb1ecc5..40fd3ae62ac5d3b8ff17718be2899ce01ca94ecb 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 a8655b6f9289fe8ea1c07222eed2384f2d97bde6..1bf1e3dc7d1f8bd40a438f712eb4f649b7dc6db3 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