From d673bdb9a000b0966c88334bb5c957cfe381fe47 Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Thu, 23 May 2013 21:43:11 +0000
Subject: [PATCH 1/2] change kernel-qa file location

---
 inventory/group_vars/kernel-qa | 2 +-
 tasks/sudo.yml                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inventory/group_vars/kernel-qa b/inventory/group_vars/kernel-qa
index 285b02c50c..f010a0081b 100644
--- a/inventory/group_vars/kernel-qa
+++ b/inventory/group_vars/kernel-qa
@@ -3,5 +3,5 @@ freezes: true
 resolvconf: $files/resolv.conf/phx2
 rsyslogconf: $files/rsyslog/rsyslog.conf.phx2
 fas_client_groups: sysadmin-kernel
-sudoers: $private/files/sudo/kernel-qa-sudoers
+sudoers: $private/files/sudo/kernel-qa
 
diff --git a/tasks/sudo.yml b/tasks/sudo.yml
index 19dd855ce5..0ec4684b6a 100644
--- a/tasks/sudo.yml
+++ b/tasks/sudo.yml
@@ -6,8 +6,8 @@
 #
 # Put in place the default sysadmin-main sudoers file. 
 #
-- name: setup /etc/sudoers.d/sysadmin-main-sudoers
-  action: copy src=$private/files/sudo/sysadmin-main-sudoers dest=/etc/sudoers.d/ owner=root group=root mode=0600
+- name: setup /etc/sudoers.d/sysadmin-main
+  action: copy src=$private/files/sudo/sysadmin-main dest=/etc/sudoers.d/ owner=root group=root mode=0600
   tags:
   - config
 #

From 8fa51d3a8afd980203d97ce7a732d8f21dd06743 Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Thu, 23 May 2013 21:53:36 +0000
Subject: [PATCH 2/2] try to make it see this file, more?

---
 tasks/sudo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/sudo.yml b/tasks/sudo.yml
index 0ec4684b6a..be074b2f0b 100644
--- a/tasks/sudo.yml
+++ b/tasks/sudo.yml
@@ -16,7 +16,7 @@
 - name: setup /etc/sudoers.d/sudoer file for client use
   action: copy src=$item dest=/etc/sudoers.d/ owner=root group=root mode=0600
   with_first_found:
-  - files: $sudoers $private/files/sudo/${ansible_fqdn}-sudoers $private/files/sudo/${ansible_hostname}-sudoers $private/files/sudo/${ansible_domain}-sudoers
+  - files: ${sudoers} ${private}/files/sudo/${ansible_fqdn}-sudoers ${private}/files/sudo/${ansible_hostname}-sudoers ${private}/files/sudo/${ansible_domain}-sudoers
   - skip: true
   tags:
   - config