From 099af709256bfb5c5c90240e52fefe6743f663e1 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 18 Nov 2019 23:47:10 +0100 Subject: [PATCH] Update roles for warnings in newer version of Ansible. --- roles/base/tasks/packages.yml | 20 +++++++------------- roles/custom/tasks/unattended-upgrades.yml | 7 +++---- roles/networkpackagemanager/tasks/npm.yml | 8 ++++---- roles/prereq/tasks/fixes.yml | 2 ++ 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index a20926b..1824849 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -15,25 +15,22 @@ - name: Removing packages commonly not required apt: - pkg: '{{ item }}' + pkg: "{{ base_common_delpkg }}" state: absent purge: yes - with_items: "{{ base_common_delpkg }}" - name: Removing packages from client machines apt: - pkg: '{{ item }}' + pkg: "{{ base_client_delpkg }}" state: absent purge: yes - with_items: "{{ base_client_delpkg }}" when: ansible_local.noderole.role == 'client' and base_client_delpkg|length > 0 - name: Removing packages from docenti machines apt: - pkg: '{{ item }}' + pkg: "{{ base_docenti_delpkg }}" state: absent purge: yes - with_items: "{{ base_docenti_delpkg }}" when: ansible_local.noderole.role == 'docenti' and base_docenti_delpkg|length > 0 - name: Cleanup of unneeded packages @@ -43,21 +40,18 @@ - name: Installing additional common packages apt: - pkg: '{{ item }}' - state: installed - with_items: "{{ base_common_addpkg }}" + pkg: "{{ base_common_addpkg }}" + state: present tags: edu-install - name: Installing additional packages for client role apt: - pkg: '{{ item }}' + pkg: "{{ base_client_addpkg }}" state: present - with_items: "{{ base_client_addpkg }}" when: ansible_local.noderole.role == 'client' and base_client_addpkg|length > 0 - name: Installing additional packages for docenti role apt: - pkg: '{{ item }}' + pkg: "{{ base_docenti_addpkg }}" state: present - with_items: "{{ base_docenti_addpkg }}" when: ansible_local.noderole.role == 'docenti' and base_docenti_addpkg|length > 0 diff --git a/roles/custom/tasks/unattended-upgrades.yml b/roles/custom/tasks/unattended-upgrades.yml index bc31daa..7724b01 100644 --- a/roles/custom/tasks/unattended-upgrades.yml +++ b/roles/custom/tasks/unattended-upgrades.yml @@ -2,11 +2,10 @@ - name: Ensure needed packages are installed apt: - name: "{{ item }}" + name: + - unattended-upgrades + - update-notifier-common state: present - with_items: - - unattended-upgrades - - update-notifier-common - name: Configuring unattended upgrades from file copy: diff --git a/roles/networkpackagemanager/tasks/npm.yml b/roles/networkpackagemanager/tasks/npm.yml index 1316a33..053ea51 100644 --- a/roles/networkpackagemanager/tasks/npm.yml +++ b/roles/networkpackagemanager/tasks/npm.yml @@ -7,18 +7,18 @@ - name: Installing packages for specific role from NetworkPackageManager apt: - name: '{{ item }}' + name: "{{ ansible_local.noderole.addpkg }}" state: present - with_items: "{{ ansible_local.noderole.addpkg }}" when: ansible_local.noderole.addpkg is defined and ansible_local.noderole.addpkg|join(' ')|trim != '' - name: Removing packages for specific role from NetworkPackageManager apt: - name: '{{ item }}' + name: "{{ ansible_local.noderole.delpkg }}" state: absent purge: yes - with_items: "{{ ansible_local.noderole.delpkg }}" when: ansible_local.noderole.delpkg is defined and ansible_local.noderole.delpkg|join(' ')|trim != '' - name: Updating local hash for packages shell: 'rm -f {{ ansible_local.checksum.pkgver_file }} && echo "{{ ansible_local.checksum.pkgver }}" > {{ ansible_local.checksum.pkgver_file }}' + args: + warn: false diff --git a/roles/prereq/tasks/fixes.yml b/roles/prereq/tasks/fixes.yml index 815be1b..61c322b 100644 --- a/roles/prereq/tasks/fixes.yml +++ b/roles/prereq/tasks/fixes.yml @@ -15,4 +15,6 @@ - name: Applying local signed fixes shell: "/usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/fixes/{{ item }} | /usr/bin/gpg --passphrase {{ domainadminpasswd }} --decrypt | sudo /bin/bash" + args: + warn: false with_items: "{{ ansible_local.domain.apply_fixes|default([]) }}"