From df513da785c1333fa96dd3fce673fa6a83db586e Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 20 Feb 2016 22:01:53 +0100 Subject: [PATCH] Cleaning up become where not required. --- ansible.cfg | 2 +- roles/base/tasks/ansible-pull.yml | 1 - roles/base/tasks/apt-sources.yml | 1 - roles/base/tasks/desktop-environment.yml | 1 - roles/base/tasks/packages.yml | 7 ------- roles/base/tasks/system-update.yml | 2 -- roles/base/tasks/virtualbox-guest-addons.yml | 1 - roles/custom/tasks/custom.yml | 6 ++---- roles/custom/tasks/unattended-upgrades.yml | 1 - roles/domain/tasks/ntp.yml | 1 - roles/domain/tasks/pam_base.yml | 1 - roles/domain/tasks/pam_mount.yml | 1 - roles/domain/tasks/pkgs.yml | 1 - roles/networkpackagemanager/tasks/npm.yml | 3 --- roles/prereq/tasks/prereq.yml | 1 - 15 files changed, 3 insertions(+), 27 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index aedbd27..90c243d 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -2,4 +2,4 @@ inventory=hosts log_path=/var/log/ansible.log host_key_checking=False -become_method=su +become_method=sudo diff --git a/roles/base/tasks/ansible-pull.yml b/roles/base/tasks/ansible-pull.yml index e7212a9..56d8b63 100644 --- a/roles/base/tasks/ansible-pull.yml +++ b/roles/base/tasks/ansible-pull.yml @@ -4,7 +4,6 @@ apt: name: ansible state: present - become: yes - name: Updating ansible-pull custom scripts get_url: diff --git a/roles/base/tasks/apt-sources.yml b/roles/base/tasks/apt-sources.yml index 33da964..e0bf876 100644 --- a/roles/base/tasks/apt-sources.yml +++ b/roles/base/tasks/apt-sources.yml @@ -18,4 +18,3 @@ - name: Updating package database apt: update_cache=yes - become: yes diff --git a/roles/base/tasks/desktop-environment.yml b/roles/base/tasks/desktop-environment.yml index 71d55c8..878ee60 100644 --- a/roles/base/tasks/desktop-environment.yml +++ b/roles/base/tasks/desktop-environment.yml @@ -11,7 +11,6 @@ - name: Installation of the desktop environment shell: "DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y install edubuntu-desktop-gnome^" when: check_edubuntu_pkg|changed - become: yes tags: edu-install - name: Change default desktop environment diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index 3508411..45147b1 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -7,7 +7,6 @@ state: absent purge: yes with_items: "{{ base_common_delpkg }}" - become: yes - name: Removing packages from client machines apt: @@ -16,7 +15,6 @@ purge: yes with_items: "{{ base_client_delpkg }}" when: ansible_local.noderole.role == 'client' and base_client_delpkg|length > 0 - become: yes - name: Removing packages from docenti machines apt: @@ -25,13 +23,11 @@ purge: yes with_items: "{{ base_docenti_delpkg }}" when: ansible_local.noderole.role == 'docenti' and base_docenti_delpkg|length > 0 - become: yes - name: Cleanup of unneeded packages shell: apt-get -y autoremove register: autoremove changed_when: "'Rimozione' in autoremove.stdout" - become: yes - name: Installing additional common packages apt: @@ -39,7 +35,6 @@ state: installed with_items: "{{ base_common_addpkg }}" tags: edu-install - become: yes - name: Installing additional packages for client role apt: @@ -47,7 +42,6 @@ state: present with_items: "{{ base_client_addpkg }}" when: ansible_local.noderole.role == 'client' and base_client_addpkg|length > 0 - become: yes - name: Installing additional packages for docenti role apt: @@ -55,7 +49,6 @@ state: present with_items: "{{ base_docenti_addpkg }}" when: ansible_local.noderole.role == 'docenti' and base_docenti_addpkg|length > 0 - become: yes - name: Correggo NetworkManager per gestire la rete lineinfile: diff --git a/roles/base/tasks/system-update.yml b/roles/base/tasks/system-update.yml index d5d2b5e..3f9b466 100644 --- a/roles/base/tasks/system-update.yml +++ b/roles/base/tasks/system-update.yml @@ -3,8 +3,6 @@ - name: Updating available packages apt: update_cache=yes cache_valid_time=180 - become: yes - name: Upgrading system apt: upgrade=full - become: yes diff --git a/roles/base/tasks/virtualbox-guest-addons.yml b/roles/base/tasks/virtualbox-guest-addons.yml index a6d2dac..530d9df 100644 --- a/roles/base/tasks/virtualbox-guest-addons.yml +++ b/roles/base/tasks/virtualbox-guest-addons.yml @@ -6,4 +6,3 @@ pkg: virtualbox-guest-dkms stat: present when: ansible_product_name == "VirtualBox" - become: yes diff --git a/roles/custom/tasks/custom.yml b/roles/custom/tasks/custom.yml index 964130f..5dd7cfd 100644 --- a/roles/custom/tasks/custom.yml +++ b/roles/custom/tasks/custom.yml @@ -3,13 +3,11 @@ - name: Installing plymouth theme apt: name: plymouth-theme-edubuntu-bglug - state: present + state: latest force: yes - become: yes - name: Installing lightdm wallpaper apt: name: bglug-artwork - state: present + state: latest force: yes - become: yes diff --git a/roles/custom/tasks/unattended-upgrades.yml b/roles/custom/tasks/unattended-upgrades.yml index 21429d0..bc31daa 100644 --- a/roles/custom/tasks/unattended-upgrades.yml +++ b/roles/custom/tasks/unattended-upgrades.yml @@ -7,7 +7,6 @@ with_items: - unattended-upgrades - update-notifier-common - become: yes - name: Configuring unattended upgrades from file copy: diff --git a/roles/domain/tasks/ntp.yml b/roles/domain/tasks/ntp.yml index 1a8214e..bb69ae0 100644 --- a/roles/domain/tasks/ntp.yml +++ b/roles/domain/tasks/ntp.yml @@ -5,7 +5,6 @@ apt: name: ntp state: present - become: yes - name: Configuring NTP template: diff --git a/roles/domain/tasks/pam_base.yml b/roles/domain/tasks/pam_base.yml index 360c590..6f265f9 100644 --- a/roles/domain/tasks/pam_base.yml +++ b/roles/domain/tasks/pam_base.yml @@ -5,7 +5,6 @@ apt: name: libpam-winbind state: present - become: yes # Leaving them here commented, as they may be needed in the future # for improvements on login times. diff --git a/roles/domain/tasks/pam_mount.yml b/roles/domain/tasks/pam_mount.yml index 48771e4..c08c9fa 100644 --- a/roles/domain/tasks/pam_mount.yml +++ b/roles/domain/tasks/pam_mount.yml @@ -5,7 +5,6 @@ apt: name: libpam-mount state: present - become: yes - name: Configuring pam_mount template: diff --git a/roles/domain/tasks/pkgs.yml b/roles/domain/tasks/pkgs.yml index f0d7e74..83e39b3 100644 --- a/roles/domain/tasks/pkgs.yml +++ b/roles/domain/tasks/pkgs.yml @@ -8,4 +8,3 @@ with_items: - winbind - samba - become: yes diff --git a/roles/networkpackagemanager/tasks/npm.yml b/roles/networkpackagemanager/tasks/npm.yml index 4d43077..56e2280 100644 --- a/roles/networkpackagemanager/tasks/npm.yml +++ b/roles/networkpackagemanager/tasks/npm.yml @@ -4,7 +4,6 @@ - name: Updating package cache. apt: update_cache=yes cache_valid_time=180 - become: yes - name: Debug debug: var=ansible_local.noderole.addpkg @@ -15,7 +14,6 @@ state: present with_items: "{{ ansible_local.noderole.addpkg }}" when: ansible_local.noderole.addpkg is defined and ansible_local.noderole.addpkg|join(' ')|trim != '' - become: yes - name: Removing packages for specific role from NetworkPackageManager apt: @@ -24,7 +22,6 @@ purge: yes with_items: "{{ ansible_local.noderole.delpkg }}" when: ansible_local.noderole.delpkg is defined and ansible_local.noderole.delpkg|join(' ')|trim != '' - become: yes - name: Updating local hash for packages shell: 'rm -f {{ ansible_local.checksum.pkgver_file }} && echo "{{ ansible_local.checksum.pkgver }}" > {{ ansible_local.checksum.pkgver_file }}' diff --git a/roles/prereq/tasks/prereq.yml b/roles/prereq/tasks/prereq.yml index 5c0fbda..6dc1cf4 100644 --- a/roles/prereq/tasks/prereq.yml +++ b/roles/prereq/tasks/prereq.yml @@ -20,7 +20,6 @@ apt: name: python-yaml state: present - become: yes - name: Creating facts.d script for the domain settings copy: