From cbaa75239cb2d1d98756ef7d87b1599fb991c051 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Fri, 22 Jul 2016 00:24:56 +0000
Subject: [PATCH] update the extra pacakges role to make it easier to cluster
specific package lists
Former-commit-id: 5941db0cf96923a084309fdfbba907aefbb000ab
---
roles/extra_packages/tasks/main.yml | 34 ++++++++-----------------
roles/extra_packages/vars/CentOS_7.yml | 10 +-------
roles/extra_packages/vars/Ubuntu_14.yml | 2 +-
3 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/roles/extra_packages/tasks/main.yml b/roles/extra_packages/tasks/main.yml
index 57a66b6b..bfc45d32 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 b2374ccd..011e9755 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 a9bdb719..d9869255 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
--
GitLab