From f7e0918af2337517fabd8306301359701257014c Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Mon, 20 May 2013 17:14:56 +0000
Subject: [PATCH] - add yumrepos.yml - separate from 'base' - make sudo work
 with all hosts add all to kernel-qa

---
 playbooks/groups/kernel-qa.yml |  4 ++++
 tasks/base.yml                 | 17 -----------------
 tasks/sudo.yml                 |  5 ++---
 tasks/yumrepos.yml             | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 tasks/yumrepos.yml

diff --git a/playbooks/groups/kernel-qa.yml b/playbooks/groups/kernel-qa.yml
index 4723a43823..9ca5a76c70 100644
--- a/playbooks/groups/kernel-qa.yml
+++ b/playbooks/groups/kernel-qa.yml
@@ -15,8 +15,12 @@
   tasks:
   # this is how you include other task lists
   - include: $tasks/hosts.yml
+  - include: $tasks/yumrepos.yml
   - include: $tasks/base.yml
   - include: $tasks/fas_client.yml
+  - include: $tasks/2fa_client.yml
+  - include: $tasks/motd.yml
+  - include: $tasks/sudo.yml
 
   handlers:
   - include: $handlers/restart_services.yml
diff --git a/tasks/base.yml b/tasks/base.yml
index b8bcfe8878..52c80b17e8 100644
--- a/tasks/base.yml
+++ b/tasks/base.yml
@@ -25,23 +25,6 @@
   tags:
   - config
 
-
-- name: put repos on system
-  action: copy src=$files/common/$item dest=/etc/yum.repos.d/$item
-  with_items:
-  - epel6.repo
-  - rhel6.repo
-  only_if: '$is_rhel'
-  tags:
-  - config
-  - packages
-
-- name: add infrastructure repo
-  action: copy src=$files/common/infrastructure.repo dest=/etc/yum.repos.d/infrastructure.repo
-
-
-# setup /etc/hosts if we can figure it all out
-
   
 - name: default packages to install
   action: yum state=installed name=$item
diff --git a/tasks/sudo.yml b/tasks/sudo.yml
index d025c3d7ff..e2e7d4be7c 100644
--- a/tasks/sudo.yml
+++ b/tasks/sudo.yml
@@ -16,8 +16,7 @@
 - name: setup /etc/sudoers.d/fedora for client use
   action: copy src=$item dest=/etc/sudoers.d/ owner=root group=root mode=0600
   with_first_found:
-  - $private/files/sudo/${ansible_fqdn}-sudoers
-  - $private/files/sudo/${ansible_hostname}-sudoers
-  - $private/files/sudo/${ansible_domain}-sudoers
+  - files: $private/files/sudo/${ansible_fqdn}-sudoers $private/files/sudo/${ansible_hostname}-sudoers $private/files/sudo/${ansible_domain}-sudoers
+  - skip: true
   tags:
   - config
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
new file mode 100644
index 0000000000..a583c288fb
--- /dev/null
+++ b/tasks/yumrepos.yml
@@ -0,0 +1,18 @@
+---
+
+- name: put repos on system
+  action: copy src=$files/common/$item dest=/etc/yum.repos.d/$item
+  with_items:
+  - epel6.repo
+  - rhel6.repo
+  only_if: '$is_rhel'
+  tags:
+  - config
+  - packages
+
+- name: add infrastructure repo
+  action: copy src=$files/common/infrastructure.repo dest=/etc/yum.repos.d/infrastructure.repo
+  tags:
+  - config
+  - packages
+