diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml index 3471ab2..0f2544a 100644 --- a/ubuntu-deb-general/tasks/packages.yml +++ b/ubuntu-deb-general/tasks/packages.yml @@ -1,13 +1,11 @@ --- - name: Install the basic python packages - apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 - with_items: '{{ default_python_packages }}' + apt: pkg={{ default_python_packages }} state=present update_cache=yes cache_valid_time=1800 when: not is_trusty tags: packages - name: Install the basic python packages on trusty - apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 - with_items: '{{ default_python_packages_trusty }}' + apt: pkg={{ default_python_packages_trusty }} state=present update_cache=yes cache_valid_time=1800 when: is_trusty tags: packages @@ -95,12 +93,10 @@ tags: packages - name: install common packages - apt: pkg={{ item }} state={{ pkg_state }} update_cache=yes cache_valid_time=1800 - with_items: '{{ common_packages }}' + apt: pkg={{ common_packages }} state={{ pkg_state }} update_cache=yes cache_valid_time=1800 tags: [ 'packages', 'common_pkgs' ] - name: Install additional packages, if any - apt: pkg={{ item }} state={{ pkg_state }} update_cache=yes cache_valid_time=1800 - with_items: '{{ additional_packages | default([]) }}' + apt: pkg={{ additional_packages | default([]) }} state={{ pkg_state }} update_cache=yes cache_valid_time=1800 tags: [ 'packages', 'common_pkgs', 'additional_packages' ] diff --git a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml b/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml index b79d57c..f551bca 100644 --- a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml +++ b/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml @@ -1,33 +1,28 @@ --- - name: Remove unneeded base packages - apt: pkg={{ item }} state=absent - with_items: '{{ cleanup_base_packages }}' + apt: pkg={{ cleanup_base_packages }} state=absent when: cleanup_base_packages tags: [ 'packages', 'pkg_cleanup' ] - name: Remove unneeded X packages - apt: pkg={{ item }} state=absent - with_items: '{{ x_base_packages_to_remove }}' + apt: pkg={{ x_base_packages_to_remove }} state=absent when: cleanup_x_base_packages tags: [ 'packages', 'pkg_cleanup' ] - name: Remove the nfs packages - apt: pkg={{ item }} state=absent - with_items: '{{ nfs_packages }}' + apt: pkg={{ nfs_packages }} state=absent when: - is_not_precise - cleanup_nfs_packages tags: [ 'packages', 'pkg_cleanup' ] - name: Remove rpcbind packages - apt: pkg={{ item }} state=absent - with_items: '{{ rpcbind_packages }}' + apt: pkg={{ rpcbind_packages }} state=absent when: cleanup_rpcbind_packages tags: [ 'packages', 'pkg_cleanup' ] - name: Remove the exim packages - apt: name={{ item }} state=absent - with_items: '{{ exim_email_server_pkgs }}' + apt: name={{ exim_email_server_pkgs }} state=absent when: cleanup_exim_email_server tags: [ 'packages', 'pkg_cleanup', 'exim' ]