From 7f0179c000bb9a35592607b07d2a8f6b16b5b18f Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 19 Oct 2018 15:32:23 +0000 Subject: [PATCH 1/2] use list with apt directly (instead of with_items) --- packer/ansible/roles/auth/tasks/sudo.yml | 2 +- .../roles/docker/tasks/lvm-setup-service.yml | 2 +- .../ansible/roles/docker/tasks/packages.yml | 7 +++--- .../ansible/roles/hardware/tasks/firmware.yml | 3 +-- .../roles/inkscape/tasks/silhouette.yml | 2 +- .../ansible/roles/labsync/tasks/localboot.yml | 7 +++--- .../roles/network-manager/tasks/main.yml | 7 +++--- .../ansible/roles/packages/tasks/debian.yml | 23 +++++++++---------- .../roles/windowmanager/tasks/lightdm.yml | 9 ++++---- 9 files changed, 28 insertions(+), 34 deletions(-) diff --git a/packer/ansible/roles/auth/tasks/sudo.yml b/packer/ansible/roles/auth/tasks/sudo.yml index a2784a1..4d19f09 100644 --- a/packer/ansible/roles/auth/tasks/sudo.yml +++ b/packer/ansible/roles/auth/tasks/sudo.yml @@ -1,6 +1,6 @@ --- - name: install sudo - package: + apt: name: sudo state: present diff --git a/packer/ansible/roles/docker/tasks/lvm-setup-service.yml b/packer/ansible/roles/docker/tasks/lvm-setup-service.yml index e5ab809..5200c7c 100644 --- a/packer/ansible/roles/docker/tasks/lvm-setup-service.yml +++ b/packer/ansible/roles/docker/tasks/lvm-setup-service.yml @@ -1,6 +1,6 @@ --- - name: install tools for lvm thin pools - package: + apt: name: thin-provisioning-tools - name: copy docker-setup script diff --git a/packer/ansible/roles/docker/tasks/packages.yml b/packer/ansible/roles/docker/tasks/packages.yml index fc43430..e4290e4 100644 --- a/packer/ansible/roles/docker/tasks/packages.yml +++ b/packer/ansible/roles/docker/tasks/packages.yml @@ -1,11 +1,10 @@ --- - name: install dependencies apt: - name: "{{ item }}" + name: + - apt-transport-https + - ca-certificates state: present - with_items: - - apt-transport-https - - ca-certificates - name: Add apt key apt_key: diff --git a/packer/ansible/roles/hardware/tasks/firmware.yml b/packer/ansible/roles/hardware/tasks/firmware.yml index 63a2fda..3e36c3c 100644 --- a/packer/ansible/roles/hardware/tasks/firmware.yml +++ b/packer/ansible/roles/hardware/tasks/firmware.yml @@ -1,6 +1,5 @@ --- - name: install firmware apt: - name: "{{ item }}" + name: "{{ hardware.firmware }}" state: present - with_items: "{{ hardware.firmware }}" diff --git a/packer/ansible/roles/inkscape/tasks/silhouette.yml b/packer/ansible/roles/inkscape/tasks/silhouette.yml index c6de75c..243de63 100644 --- a/packer/ansible/roles/inkscape/tasks/silhouette.yml +++ b/packer/ansible/roles/inkscape/tasks/silhouette.yml @@ -1,6 +1,6 @@ --- - name: install python-usb - package: + apt: name: python-usb state: present diff --git a/packer/ansible/roles/labsync/tasks/localboot.yml b/packer/ansible/roles/labsync/tasks/localboot.yml index 7335768..34421d7 100644 --- a/packer/ansible/roles/labsync/tasks/localboot.yml +++ b/packer/ansible/roles/labsync/tasks/localboot.yml @@ -1,11 +1,10 @@ --- - name: install dependencies apt: - name: "{{ item }}" + name: + - grub2 + - rsync state: present - with_items: - - grub2 - - rsync - name: copy labsync-install-localboot script copy: diff --git a/packer/ansible/roles/network-manager/tasks/main.yml b/packer/ansible/roles/network-manager/tasks/main.yml index 65a6e73..5514429 100644 --- a/packer/ansible/roles/network-manager/tasks/main.yml +++ b/packer/ansible/roles/network-manager/tasks/main.yml @@ -2,10 +2,9 @@ - block: - name: install network-manager apt: - name: "{{ item }}" + name: + - network-manager + - network-manager-gnome state: present - with_items: - - network-manager - - network-manager-gnome tags: - network-manager diff --git a/packer/ansible/roles/packages/tasks/debian.yml b/packer/ansible/roles/packages/tasks/debian.yml index 25a41a6..27ed6b3 100644 --- a/packer/ansible/roles/packages/tasks/debian.yml +++ b/packer/ansible/roles/packages/tasks/debian.yml @@ -1,17 +1,16 @@ --- - name: install debian packages apt: - name: "{{ item }}" + name: + - bash + - less + - htop + - systemd-sysv + - vim-nox + - pciutils + - usbutils + - strace + - net-tools + - lshw state: present update_cache: yes - with_items: - - bash - - less - - htop - - systemd-sysv - - vim-nox - - pciutils - - usbutils - - strace - - net-tools - - lshw diff --git a/packer/ansible/roles/windowmanager/tasks/lightdm.yml b/packer/ansible/roles/windowmanager/tasks/lightdm.yml index 472b035..5265959 100644 --- a/packer/ansible/roles/windowmanager/tasks/lightdm.yml +++ b/packer/ansible/roles/windowmanager/tasks/lightdm.yml @@ -1,12 +1,11 @@ --- - name: install lightdm apt: - name: "{{ item }}" + name: + - lightdm + - lightdm-gtk-greeter + - fonts-roboto state: present - with_items: - - lightdm - - lightdm-gtk-greeter - - fonts-roboto - name: get background image for lightdm copy: From 60aa02ebae605ccf09314df1c156e27fe0a09cc0 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 19 Oct 2018 15:44:01 +0000 Subject: [PATCH 2/2] use loop instead of with_items --- packer/ansible/roles/windowmanager/tasks/lightdm.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packer/ansible/roles/windowmanager/tasks/lightdm.yml b/packer/ansible/roles/windowmanager/tasks/lightdm.yml index 5265959..0e2f515 100644 --- a/packer/ansible/roles/windowmanager/tasks/lightdm.yml +++ b/packer/ansible/roles/windowmanager/tasks/lightdm.yml @@ -18,7 +18,7 @@ section: greeter option: "{{ item.option }}" value: "{{ item.value }}" - with_items: + loop: - option: background value: /etc/lightdm/bg.jpg - option: font-name @@ -46,7 +46,7 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" mode: "0755" - with_items: + loop: - src: guest-session-setup.sh dest: /usr/share/lightdm/guest-session/setup.sh - src: guest-account.sh @@ -58,7 +58,7 @@ section: "Seat:*" option: "{{ item.option }}" value: "{{ item.value }}" - with_items: + loop: - option: allow-guest value: "true" - option: greeter-allow-guest