From 22f28298eb9ba43a35232eaeb6f8906a7af1d11d Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Wed, 17 Oct 2018 16:50:28 +0200
Subject: [PATCH] Remove with_items from apt
---
client/tasks/kde.yml | 120 ++++++++++----------
client/tasks/software.yml | 201 +++++++++++++++++-----------------
guest-overlay/tasks/main.yml | 6 +-
terminalserver/tasks/main.yml | 11 +-
terminalserver/tasks/x2go.yml | 9 +-
5 files changed, 181 insertions(+), 166 deletions(-)
diff --git a/client/tasks/kde.yml b/client/tasks/kde.yml
index 8f8f40b..5570963 100644
--- a/client/tasks/kde.yml
+++ b/client/tasks/kde.yml
@@ -3,12 +3,13 @@
- name: ensure reasonable subset of kde-baseapps is installed
- apt: name={{ item }} state=present
- with_items:
- - dolphin
- - kde-baseapps-bin
- - konsole
- - kdepasswd
+ apt:
+ name:
+ - dolphin
+ - kde-baseapps-bin
+ - konsole
+ - kdepasswd
+ state: present
tags:
- packages
- kde
@@ -16,16 +17,17 @@
- kde-baseapps
- name: ensure reasonable subset of kde-plasma-desktop is installed
- apt: name={{ item }} state=present
- with_items:
- - plasma-desktop
- - plasma-workspace
- - kde-runtime
- - udisks2
- - upower
- - sddm
- - sddm-theme-breeze
- - xserver-xorg
+ apt:
+ name:
+ - plasma-desktop
+ - plasma-workspace
+ - kde-runtime
+ - udisks2
+ - upower
+ - sddm
+ - sddm-theme-breeze
+ - xserver-xorg
+ state: present
tags:
- packages
- kde
@@ -33,23 +35,24 @@
- kde-plasma-desktop
- name: ensure reasonable subset of kde-standard is installed
- apt: name={{ item }} state=present
- with_items:
- - ark
- - gwenview
- - kate
- - kcalc
- - kde-spectacle
- - khelpcenter
- - kwalletmanager
- - okular
- - plasma-dataengines-addons
- - plasma-pa
- - plasma-runners-addons
- - plasma-wallpapers-addons
- - plasma-widgets-addons
- - polkit-kde-agent-1
- - sweeper
+ apt:
+ name:
+ - ark
+ - gwenview
+ - kate
+ - kcalc
+ - kde-spectacle
+ - khelpcenter
+ - kwalletmanager
+ - okular
+ - plasma-dataengines-addons
+ - plasma-pa
+ - plasma-runners-addons
+ - plasma-wallpapers-addons
+ - plasma-widgets-addons
+ - polkit-kde-agent-1
+ - sweeper
+ state: present
tags:
- packages
- kde
@@ -57,17 +60,18 @@
- kde-standard
- name: ensure reasonable subset of kdeutils is installed
- apt: name={{ item }} state=present
- with_items:
- - ark
- - filelight
- - kcalc
- - kcharselect
- - kdf
- - kgpg
- - ktimer
- - kwalletmanager
- - sweeper
+ apt:
+ name:
+ - ark
+ - filelight
+ - kcalc
+ - kcharselect
+ - kdf
+ - kgpg
+ - ktimer
+ - kwalletmanager
+ - sweeper
+ state: present
tags:
- packages
- kde
@@ -75,12 +79,13 @@
- kdeutils
- name: ensure reasonable subset of kde-full is installed
- apt: name={{ item }} state=present
- with_items:
- - kdeartwork
- - kdeadmin
- - kdegames
- - kdegraphics
+ apt:
+ name:
+ - kdeartwork
+ - kdeadmin
+ - kdegames
+ - kdegraphics
+ state: present
tags:
- packages
- kde
@@ -88,13 +93,14 @@
- kde-full
- name: ensure some further kde packages are installed
- apt: name={{ item }} state=present
- with_items:
- - gtk2-engines-oxygen
- - gtk3-engines-breeze
- - kde-config-gtk-style
- - kde-l10n-de
- - krdc
+ apt:
+ name:
+ - gtk2-engines-oxygen
+ - gtk3-engines-breeze
+ - kde-config-gtk-style
+ - kde-l10n-de
+ - krdc
+ state: present
tags:
- packages
- kde
diff --git a/client/tasks/software.yml b/client/tasks/software.yml
index 890c844..f19fe26 100644
--- a/client/tasks/software.yml
+++ b/client/tasks/software.yml
@@ -2,123 +2,126 @@
# file: roles/client/tasks/desktop.yml
- name: ensure office applications are installed
- apt: name={{ item }} state=present
- with_items:
- - libreoffice # this is a meta-package
- - libreoffice-help-de
- - libreoffice-l10n-de
- - texstudio
+ apt:
+ name:
+ - libreoffice # this is a meta-package
+ - libreoffice-help-de
+ - libreoffice-l10n-de
+ - texstudio
+ state: present
- name: ensure artistic applications are installed
- apt: name={{ item }} state=present
- with_items:
- - inkscape
- - gimp
- - gimp-dcraw
- - gimp-texturize
- - scribus
- - scribus-doc
- - scribus-template
- - dia
- - gnuplot
+ apt:
+ name:
+ - inkscape
+ - gimp
+ - gimp-dcraw
+ - gimp-texturize
+ - scribus
+ - scribus-doc
+ - scribus-template
+ - dia
+ - gnuplot
+ state: present
- name: ensure pdf applications are installed
- apt: name={{ item }} state=present
- with_items:
- - evince
- - gv
- - pdfgrep
- - pdfjam
- - pdfmod
- - pdftk
- - xournal
- - poppler-utils
+ apt:
+ name:
+ - evince
+ - gv
+ - pdfgrep
+ - pdfjam
+ - pdfmod
+ - pdftk
+ - xournal
+ - poppler-utils
+ state: present
- name: ensure finance applications are installed
- apt: name={{ item }} state=present
- with_items:
- - gnucash
- - kmymoney
+ apt:
+ name:
+ - gnucash
+ - kmymoney
+ state: present
- name: ensure python packages are installed
- apt: name={{ item }} state=present
- with_items:
- - python-matplotlib
- - python-numpy
- - python-opencv
- - python-openssl
- - python-pip
- - python-prettytable
- - python-pysnmp4
- - python-scipy
- - python-virtualenv
- - python3
- - python3-matplotlib
- - python3-pip
- - python3-pyqt5
- - python3-scipy
- - python3-venv
- - python3-virtualenv
- - virtualenv
- - ipython
- - ipython3
+ apt:
+ name:
+ - python-matplotlib
+ - python-numpy
+ - python-opencv
+ - python-openssl
+ - python-pip
+ - python-prettytable
+ - python-pysnmp4
+ - python-scipy
+ - python-virtualenv
+ - python3
+ - python3-matplotlib
+ - python3-pip
+ - python3-pyqt5
+ - python3-scipy
+ - python3-venv
+ - python3-virtualenv
+ - virtualenv
+ - ipython
+ - ipython3
+ state: present
- name: ensure haskell packages are installed
- apt: name={{ item }} state=present
- with_items:
- - pandoc
- - ghc
- - c2hs
- - libghc-hakyll-dev
- - cabal-install
- - alex
- - happy
+ apt:
+ name:
+ - pandoc
+ - ghc
+ - c2hs
+ - libghc-hakyll-dev
+ - cabal-install
+ - alex
+ - happy
+ state: present
- name: ensure x11 development packages are installed
- apt: name={{ item }} state=present
- with_items:
- - libasound2-dev
- - libx11-dev
- - libxext-dev
- - libxft-dev
- - libxinerama-dev
- - libxrandr-dev
+ apt:
+ name:
+ - libasound2-dev
+ - libx11-dev
+ - libxext-dev
+ - libxft-dev
+ - libxinerama-dev
+ - libxrandr-dev
+ state: present
- name: ensure other development environments are installed
- apt: name={{ item }} state=present
- with_items:
- - default-jdk
- - octave
-# - root-system
-# - libroot-bindings-python5.34
+ apt:
+ name:
+ - default-jdk
+ - octave
+ state: present
- name: ensure development applications are installed
- apt: name={{ item }} state=present
- with_items:
- - cmake
- - meld
- - subversion
- - git-svn
- - gitk
- - mysql-client
- - gdb
+ apt:
+ name:
+ - cmake
+ - meld
+ - subversion
+ - git-svn
+ - gitk
+ - mysql-client
+ - gdb
+ state: present
- name: ensure mozilla applications are installed
- apt: name={{ item }} state=present
- with_items:
- - thunderbird
- - thunderbird-l10n-de
- - firefox-esr
- - firefox-esr-l10n-de
- - lightning
- - lightning-l10n-de
- - enigmail
- - xul-ext-quotecolors
-# - xul-ext-ublock-origin
-# - xul-ext-https-everywhere
-# - xul-ext-sieve
-# - xul-ext-noscript
-# - xul-ext-kwallet5
+ apt:
+ name:
+ - thunderbird
+ - thunderbird-l10n-de
+ - firefox-esr
+ - firefox-esr-l10n-de
+ - lightning
+ - lightning-l10n-de
+ - enigmail
+ - xul-ext-quotecolors
+ state: present
- name: ensure google applications are installed
apt: name={{ item }} state=present
diff --git a/guest-overlay/tasks/main.yml b/guest-overlay/tasks/main.yml
index ff9e5b6..4ae63c4 100644
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
@@ -23,7 +23,11 @@
- name: ensure aufs and pam-mount are available
- apt: name=aufs-tools,libpam-mount state=latest
+ apt:
+ name:
+ - aufs-tools
+ - libpam-mount
+ state: present
tags:
- guest-overlay
- packages
diff --git a/terminalserver/tasks/main.yml b/terminalserver/tasks/main.yml
index 209793a..83ca758 100644
--- a/terminalserver/tasks/main.yml
+++ b/terminalserver/tasks/main.yml
@@ -2,11 +2,12 @@
# file: roles/portal/tasks/main.yml
- name: ensure additional software is installed
- apt: name={{ item }} state=present
- with_items:
- - etherwake
- - wakeonlan
- - bitlbee
+ apt:
+ name:
+ - etherwake
+ - wakeonlan
+ - bitlbee
+ state: present
tags:
- packages
diff --git a/terminalserver/tasks/x2go.yml b/terminalserver/tasks/x2go.yml
index 590aa83..adebcd5 100644
--- a/terminalserver/tasks/x2go.yml
+++ b/terminalserver/tasks/x2go.yml
@@ -32,10 +32,11 @@
- packages
- name: ensure x2go server is installed
- apt: name={{ item }} state=latest
- with_items:
- - x2goserver
- - x2goserver-xsession
+ apt:
+ name:
+ - x2goserver
+ - x2goserver-xsession
+ state: present
tags:
- x2go
- packages
--
GitLab