From 57160872df338e31d1847f2cd29298751158b862 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Wed, 17 Oct 2018 16:51:47 +0200
Subject: [PATCH] Remove with_items from apt
---
shell/tasks/shell.yml | 69 +++++++++++++++++++++----------------------
shell/tasks/sudo.yml | 2 +-
2 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/shell/tasks/shell.yml b/shell/tasks/shell.yml
index fcea816..24091f4 100644
--- a/shell/tasks/shell.yml
+++ b/shell/tasks/shell.yml
@@ -3,58 +3,55 @@
- name: ensure installation of basic shell commands
apt:
- name: "{{ item }}"
+ name:
+ - git
+ - vim
+ - vim-scripts
+ - zsh
state: present
install_recommends: no
- with_items:
- - git
- - vim
- - vim-scripts
- - zsh
tags:
- packages
- shell
- name: ensure installaton of some additional software
apt:
- name: "{{ item }}"
+ name:
+ - aptitude
+ - atop
+ - build-essential
+ - curl
+ - dnsutils
+ - ethtool
+ - file
+ - git-extras
+ - htop
+ - iotop
+ - lsof
+ - mtr-tiny
+ - ncurses-term
+ - nmap
+ - pv
+ - reptyr
+ - rsync
+ - screen
+ - strace
+ - sysstat
+ - tcpdump
+ - tmux
+ - tree
+ - whois
+ - less
+ - man
state: present
- with_items:
- - aptitude
- - atop
- - build-essential
- - curl
- - dnsutils
- - ethtool
- - file
- - git-extras
- - htop
- - iotop
- - lsof
- - mtr-tiny
- - ncurses-term
- - nmap
- - pv
- - reptyr
- - rsync
- - screen
- - strace
- - sysstat
- - tcpdump
- - tmux
- - tree
- - whois
- - less
- - man
tags:
- packages
- shell
- name: ensure installation of variable additional software
apt:
- name: "{{ item }}"
+ name: "{{shell_software}}"
state: present
- with_items: "{{ shell_software }}"
tags:
- packages
- shell
diff --git a/shell/tasks/sudo.yml b/shell/tasks/sudo.yml
index eab3f54..ab0b52c 100644
--- a/shell/tasks/sudo.yml
+++ b/shell/tasks/sudo.yml
@@ -2,7 +2,7 @@
# file: roles/common/tasks/sudo.yml
- name: ensure sudo is installed
- apt: state=latest name=sudo
+ apt: state=present name=sudo
tags:
- sudo
- packages
--
GitLab