From b04806035fa7b605757d68b823651c28abd3f0c1 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Thu, 6 Jun 2013 17:53:54 +0000 Subject: [PATCH] try out lists of base removals as vars instead of with_items --- tasks/base.yml | 11 +++-------- vars/Fedora.yml | 4 ++++ vars/RedHat.yml | 4 +++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tasks/base.yml b/tasks/base.yml index 3d1c9ec43a..6510f6f06c 100644 --- a/tasks/base.yml +++ b/tasks/base.yml @@ -66,26 +66,21 @@ - name: default pkgs to remove on fedora action: yum state=removed name=$item - with_items: - - firewalld - - PackageKit* - - sendmail - - at + with_items: $base_pkgs_erase only_if: '$is_fedora' tags: - packages - name: pkgs to install on fedora action: yum state=installed name=$item - with_items: - - iptables-services + with_items: $base_pkgs_inst only_if: '$is_fedora' tags: - packages - name: disabled services on fedora action: service state=stopped enabled=false name=$item - with_items: + with_items: $service_disabled only_if: '$is_fedora' tags: - service diff --git a/vars/Fedora.yml b/vars/Fedora.yml index 46fe79d679..c9ef192a24 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -1,2 +1,6 @@ --- dist_tag: f${ansible_distribution_version} +base_pkgs_inst: ['iptables-services' ] +base_pkgs_erase: ['firewalld', 'PackageKit*', 'sendmail', 'at'] +service_disabled: [ ] +service_enabled: [ ] \ No newline at end of file diff --git a/vars/RedHat.yml b/vars/RedHat.yml index cbd9f9c3b9..19f22c640f 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,2 +1,4 @@ --- -dist_tag: el${ansible_distribution_version[0]} \ No newline at end of file +dist_tag: el${ansible_distribution_version[0]} +base_pkgs_inst: [ ] +base_pkgs_erase: [ ]