From 8887eb08e2c4cf8d8035cfc0cde433a357bb842d Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Tue, 7 May 2013 16:14:50 +0000
Subject: [PATCH] reorder and make sure nfs-related daemons are running

---
 tasks/koji/base_builder.yml  | 17 ++++++++++++++++-
 tasks/koji/releng_config.yml | 28 ++++++++++++++++++----------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/tasks/koji/base_builder.yml b/tasks/koji/base_builder.yml
index 3a6098a8ca..034c98221b 100644
--- a/tasks/koji/base_builder.yml
+++ b/tasks/koji/base_builder.yml
@@ -124,8 +124,23 @@
 - name: copy over authorized keys for root
   action: copy src=$files/kojibuilder/root_auth_keys dest=/root/.ssh/authorized_keys mode=644
 
+
+
+# idmapd and make sure it's set to run
+- name: idmapd.conf
+  action: copy src=$files/kojibuilder/idmapd.conf dest=/etc/idmapd.conf
+  tags:
+  - configs
+- name: enable nfs-related services and run them
+  action: service name=$item  enabled=true state=started
+  with_items:
+  - rpcidmapd
+  - rpcbind
+  - nfs
+  - nfslock
+
 - name: nfs mount points
-  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=present
+  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 opts=ro,hard,bg,intr,noatime,nodev,nosuid passno=0 dump=0 state=mounted
   only_if: "not '${inventory_hostname}'.startswith('bkernel')"
 
 # mock configs for pungify job
diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml
index 677c319700..8ed758e1ca 100644
--- a/tasks/koji/releng_config.yml
+++ b/tasks/koji/releng_config.yml
@@ -128,22 +128,30 @@
     - fedora-rawhide-compose-i386.cfg
     - fedora-branched-compose-x86_64.cfg
 
-- name: nfs mount - /mnt/koji
-  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 opts=rw,soft,intr passno=0 dump=0 state=present
-- name: route to netapp network
-  action: copy src=$files/kojibuilder/route-eth1 dest=/etc/sysconfig/network-scripts/route-eth1
-
-- 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=present  
-
 
 # idmapd and make sure it's set to run
 - name: idmapd.conf
   action: copy src=$files/kojibuilder/idmapd.conf dest=/etc/idmapd.conf
   tags:
   - configs
-- name: rpcidmapd on
-  action: service name=rpcidmapd  enabled=true
+- name: enable nfs-related services and run them
+  action: service name=$item  enabled=true state=started
+  with_items:
+  - rpcidmapd
+  - rpcbind
+  - nfs
+  - nfslock
+
+
+- name: route to netapp network
+  action: copy src=$files/kojibuilder/route-eth1 dest=/etc/sysconfig/network-scripts/route-eth1
+
+- 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 - /mnt/koji
+  action: mount name=/mnt/koji src=nfs01.phx2.fedoraproject.org:/ fstype=nfs4 opts=rw,soft,intr passno=0 dump=0 state=mounted
+
 
 # put cron job in for branched compose
 - name: branched compose cron