diff --git a/roles/extra_packages/tasks/main.yml b/roles/extra_packages/tasks/main.yml index 57a66b6b75d7b1beb6f935bfacaea88cd00aba65..bfc45d323e89f13e0525ae7adf04bfa0431cc180 100644 --- a/roles/extra_packages/tasks/main.yml +++ b/roles/extra_packages/tasks/main.yml @@ -1,32 +1,18 @@ --- -- include_vars: "{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml" +- name: load vars + include_vars: "{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml" + when: extra_packages is not defined -#- name: "Install extra packages" -# yum: "name={{ item }} state=present" -# with_items: "{{ packages }}" -# become: true -# become_user: root -# when: ansible_os_family == 'RedHat' - -- name: "Install package groups" - yum: "name={{ item }} state=present" - with_items: "{{ package_groups }}" +- name: "Install extra packages" + yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present" + with_items: "{{ extra_packages }}" become: true become_user: root when: ansible_os_family == 'RedHat' -- name: "Install environment groups" - yum: "name={{ item }} state=present" - with_items: "{{ environment_groups }}" +- name: "Install extra packages" + apt: "name={{ item }} update_cache=yes state=present" + with_items: "{{ extra_packages }}" become: true become_user: root - when: ansible_os_family == 'RedHat' - -#- name: "Install extra packages" -# apt: "name={{ item }} state=present" -# with_items: "{{ packages }}" -# become: true -# become_user: root -# when: ansible_os_family == 'Debian' - - + when: ansible_os_family == 'Debian' diff --git a/roles/extra_packages/vars/CentOS_7.yml b/roles/extra_packages/vars/CentOS_7.yml index b2374ccd71d22286a47c79533ca661efd44d59a1..011e97555eaf6ea19870e0ebbbea95ef9aa35156 100644 --- a/roles/extra_packages/vars/CentOS_7.yml +++ b/roles/extra_packages/vars/CentOS_7.yml @@ -1,16 +1,8 @@ -# all packages to be installed on centos 7 - -package_groups: - # - '@development-tools' +extra_packages: - '@Development Tools' - -environment_groups: - # - "@^gnome-desktop-environment" #gnome environment - '@^Server with GUI' - '@^GNOME Desktop' - '@^KDE Plasma Workspaces' - -packages: - lzip - screen - mailx diff --git a/roles/extra_packages/vars/Ubuntu_14.yml b/roles/extra_packages/vars/Ubuntu_14.yml index a9bdb71983ef395f3fc5a23c9d59158a4eeb691e..d9869255c24dfa1bb2fe009f9520a129c7001440 100644 --- a/roles/extra_packages/vars/Ubuntu_14.yml +++ b/roles/extra_packages/vars/Ubuntu_14.yml @@ -1,5 +1,5 @@ # all packages to be installed on centos 7 -packages: +extra_packages: - screen - mailutils - subversion