From db0c7ab9ea0afc6221bb69820cf37f82c4adbdce Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Thu, 6 Jun 2013 18:04:01 +0000
Subject: [PATCH] make it more generic and remove the fedora/rhel specific
 tasks

---
 tasks/base.yml  | 52 +++++++++++--------------------------------------
 vars/RedHat.yml |  6 ++++--
 vars/global.yml |  3 +++
 3 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/tasks/base.yml b/tasks/base.yml
index 6510f6f06c..321fcb2647 100644
--- a/tasks/base.yml
+++ b/tasks/base.yml
@@ -26,67 +26,37 @@
   - config
 
   
-- name: default packages to install
+- name: global default packages to install
   action: yum state=installed name=$item
-  with_items:
-  - bind-utils
-  - joe
-  - mailx
-  - nc
-  - openssh-clients
-  - patch
-  - postfix
-  - rsync
-  - strace
-  - telnet
-  - tmpwatch
-  - traceroute
-  - vim-enhanced
-  - xz
-  - zsh
+  with_items: $global_pkgs_inst
   tags:
   - packages
 
-#### RHEL SPECIFIC - see the only_if
-- name: default pkgs to remove on rhel
-  action: yum state=removed name=$item
-  with_items:
-  - logwatch
-  - firstboot-tui
-  - bluez-utils
-  - sendmail
-  only_if: '$is_rhel'
-  tags:
-  - packages
-
-
-### END RHEL SPECIFIC ####
-
-### FEDORA SPECIFIC BITS ####
-
-- name: default pkgs to remove on fedora
+- name: dist pkgs to remove
   action: yum state=removed name=$item
   with_items: $base_pkgs_erase
-  only_if: '$is_fedora'
   tags:
   - packages
 
-- name: pkgs to install on fedora
+- name: dist pkgs to install
   action: yum state=installed name=$item
   with_items: $base_pkgs_inst
-  only_if: '$is_fedora'
   tags:
   - packages
 
-- name: disabled services on fedora
+- name: dist disabled services
   action: service state=stopped enabled=false name=$item
   with_items: $service_disabled
-  only_if: '$is_fedora'
   tags:
   - service
   - config
 
-#### END FEDORA SPECIFIC ####
+- name: dist enabled services
+  action: service state=running enabled=true name=$item
+  with_items: $service_enabled
+  tags:
+  - service
+  - config
 
 
 - name: iptables
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 19f22c640f..264622eb14 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,4 +1,6 @@
 ---
 dist_tag: el${ansible_distribution_version[0]}
-base_pkgs_inst: [ ]
-base_pkgs_erase: [ ]
+base_pkgs_inst: []
+base_pkgs_erase: ['logwatch','firstboot-tui','bluez-utils', 'sendmail']
+service_disabled: []
+service_enabled: []
diff --git a/vars/global.yml b/vars/global.yml
index 6864102420..2ab9d118ea 100644
--- a/vars/global.yml
+++ b/vars/global.yml
@@ -16,3 +16,6 @@ f18_qcow_id: ami-00000016
 el6_ami_id: ami-0000000e
 f17_qcow_id: ami-00000001
 f19_qcow_id: ami-00000018
+global_pkgs_inst: ['bind-utils', 'joe', 'mailx', 'nc', 'openssh-clients', 
+                   'patch', 'postfix', 'rsync', 'strace', 'telnet', 
+                   'tmpwatch', 'traceroute', 'vim-enhanced', 'xz', 'zsh' ]