From 453606bb35c31771b99f7eabc77095a9a789a2d3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Tue, 24 Mar 2015 16:01:06 +0000
Subject: [PATCH] add fas and sudoers to all builders

---
 inventory/group_vars/buildarm     | 2 ++
 inventory/group_vars/buildhw      | 2 ++
 inventory/group_vars/buildvm      | 2 ++
 inventory/group_vars/buildvm-stg  | 2 ++
 roles/koji_builder/tasks/main.yml | 3 +--
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 1132ab2dd1..c420539fb4 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -1 +1,3 @@
 host_group: kojibuilder
+fas_client_groups: sysadmin-releng
+sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index 6ac646ea04..1beb81c50f 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -1,3 +1,5 @@
 ---
 host_group: kojibuilder
+fas_client_groups: sysadmin-releng
+sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 freezes: true
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index d82ec20b56..dbef487046 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -23,3 +23,5 @@ virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
+fas_client_groups: sysadmin-releng
+sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index 4c0f36a2d3..9bc9a95522 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -21,5 +21,7 @@ virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
+fas_client_groups: sysadmin-releng
+sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 datacenter: staging
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 929a74fe6c..8e917001dc 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -252,8 +252,7 @@
   - koji_builder
 
 
-- name: setup fas and sudo on builders
-  sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
+- name: setup fas on all builders
   tasks:
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"