From 668fa6eab03bff3228fbd4fb2e71043004fb1298 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 16 Oct 2014 16:37:42 +0000
Subject: [PATCH] Tag up the nfs/server role.

---
 playbooks/groups/composers.yml  | 14 ++++++++++++--
 roles/nfs/server/tasks/main.yml | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml
index fff82e496e..de25ee7ee3 100644
--- a/playbooks/groups/composers.yml
+++ b/playbooks/groups/composers.yml
@@ -39,8 +39,18 @@
   - collectd/base
   - hosts
   - builder_repo
-  - { 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' }
+  - role: nfs/client
+    mnt_dir: '/pub/fedora'
+    nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora'
+    when: datacenter != 'staging'
+  - role: nfs/client
+    mnt_dir: '/mnt/fedora_koji'
+    nfs_src_dir: 'fedora_koji'
+    when: datacenter != 'staging'
+  - role: nfs/client
+    mnt_dir: 'mnt/koji'
+    nfs_src_dir: 'mnt/koji'
+    when: datacenter == 'staging'
   - releng
   - fedmsg/base
 
diff --git a/roles/nfs/server/tasks/main.yml b/roles/nfs/server/tasks/main.yml
index 4e925737d1..811fb1362f 100644
--- a/roles/nfs/server/tasks/main.yml
+++ b/roles/nfs/server/tasks/main.yml
@@ -1,17 +1,19 @@
-# 
+#
 # Install needed packages
 #
 - name: Install needed nfs server packages
   yum: pkg={{ item }} state=installed
-  with_items: 
+  with_items:
   - nfs-utils
   - rpcbind
+  tags:
+  - nfs/server
 
 - name: setup /etc/exports
   copy: src={{ ansible_fqdn }}-exports dest=/etc/exports
-  tags: 
-  - nfs/server   
   register: exports
+  tags:
+  - nfs/server
 
 - name: enable nfs-related services and run them (fedora)
   action: service name={{ item }}  enabled=true state=started
@@ -19,6 +21,8 @@
   - nfs-idmap
   - nfs-lock
   when: ansible_distribution == 'Fedora'
+  tags:
+  - nfs/server
 
 - name: enable nfs-related services and run them (rhel)
   action: service name={{ item }}  enabled=true state=started
@@ -28,7 +32,11 @@
   - nfs
   - nfslock
   when: ansible_distribution == 'RedHat'
+  tags:
+  - nfs/server
 
 - name: Kick exportfs if /etc/exports changed
   command: /usr/sbin/exportfs -ra
   when: exports.changed
+  tags:
+  - nfs/server