From 8346166c90fe283a9322a9ccd68af5aa1b01a46f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 8 Jul 2014 21:22:19 +0000
Subject: [PATCH] drop nfs stuff from releng, add nfs/client to compose
 machines.

---
 inventory/group_vars/releng    |  2 ++
 playbooks/groups/composers.yml |  2 ++
 roles/releng/tasks/main.yml    | 18 ------------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/inventory/group_vars/releng b/inventory/group_vars/releng
index 1ed1c2b6a9..82cd018cad 100644
--- a/inventory/group_vars/releng
+++ b/inventory/group_vars/releng
@@ -34,3 +34,5 @@ fedmsg_certs:
 - service: bodhi
   owner: root
   group: masher
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml
index 827e693dd2..019d1f7187 100644
--- a/playbooks/groups/composers.yml
+++ b/playbooks/groups/composers.yml
@@ -41,6 +41,8 @@
   - builder_repo
   - releng
   - fedmsg/base
+  - { role: nfs/client, mnt_dir: '/pub/fedora',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora' }
+  - { role: nfs/client, mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
 
   tasks:
   - include: "{{ tasks }}/motd.yml"
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 27057e9163..6410f30d1c 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -99,24 +99,6 @@
   tags:
   - configs
 
-- name: enable nfs-related services and run them (fedora)
-  action: service name={{ item }}  enabled=true state=started
-  with_items:
-  - nfs-idmapd
-  - nfs-lock
-  when: ansible_distribution == 'Fedora'
-
-- name: route to netapp network
-  action: copy src="{{ files }}/../roles/koji_builder/files/route-eth1" dest=/etc/sysconfig/network-scripts/route-eth1
-  notify:
-  - restart netapproute
-
-- name: nfsmount - /pub/fedora
-  action: mount name=/pub/fedora src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_ftp/fedora.redhat.com/pub/fedora fstype=nfs opts=rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3 passno=0 dump=0 state=mounted
-
-- name: nfs mount points
-  action: mount name=/mnt/fedora_koji src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_koji fstype=nfs opts=rw,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
-
 - name: make a mnt/koji link
   action: file state=link src=/mnt/fedora_koji/koji dest=/mnt/koji