From 06bd8dfd92c39c6e6eacb6ae62e0b338a5139f88 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 4 Jun 2014 18:07:59 +0000
Subject: [PATCH] Reorg the nfs role to have client and server as subroles.

---
 playbooks/groups/buildhw.yml                           | 2 +-
 playbooks/groups/buildvm.yml                           | 2 +-
 playbooks/groups/download.yml                          | 2 +-
 playbooks/groups/wiki.yml                              | 4 ++--
 roles/{nfs_client => nfs/client}/files/route-eth1.phx2 | 0
 roles/{nfs_client => nfs/client}/files/route-eth1.rdu  | 0
 roles/{nfs_client => nfs/client}/tasks/main.yml        | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename roles/{nfs_client => nfs/client}/files/route-eth1.phx2 (100%)
 rename roles/{nfs_client => nfs/client}/files/route-eth1.rdu (100%)
 rename roles/{nfs_client => nfs/client}/tasks/main.yml (100%)

diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index a7e7b6277a..3e438aedb4 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -14,7 +14,7 @@
 
   roles:
   - base
-  - { role: nfs_client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
+  - { role: nfs/client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
   - koji_builder
   - { role: bkernel, when: inventory_hostname.startswith('bkernel') }
 
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index c52e201f26..b0f206ebc8 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -33,7 +33,7 @@
 
   roles:
   - base
-  - { role: nfs_client, when: not inventory_hostname.startswith('arm'), mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
+  - { role: nfs/client, when: not inventory_hostname.startswith('arm'), mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
   - koji_builder
 
   tasks:
diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml
index bbe6ffe852..c51a6609a0 100644
--- a/playbooks/groups/download.yml
+++ b/playbooks/groups/download.yml
@@ -56,7 +56,7 @@
   - download
   - mod_limitipconn
   - rsyncd
-  - { role: nfs_client, when: datacenter == "phx2", mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
+  - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
   - { role: nfs_client, when: datacenter == "rdu", mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
 
   tasks:
diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml
index 7d8bc43002..5be804464b 100644
--- a/playbooks/groups/wiki.yml
+++ b/playbooks/groups/wiki.yml
@@ -39,8 +39,8 @@
   - fas_client
   - collectd/base
   - fedmsg/base
-  - { role: nfs_client, when: env == "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app_staging/app/attachments' }
-  - { role: nfs_client, when: env != "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app/app/attachments' }
+  - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app_staging/app/attachments' }
+  - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app/app/attachments' }
   - mediawiki
 
   tasks:
diff --git a/roles/nfs_client/files/route-eth1.phx2 b/roles/nfs/client/files/route-eth1.phx2
similarity index 100%
rename from roles/nfs_client/files/route-eth1.phx2
rename to roles/nfs/client/files/route-eth1.phx2
diff --git a/roles/nfs_client/files/route-eth1.rdu b/roles/nfs/client/files/route-eth1.rdu
similarity index 100%
rename from roles/nfs_client/files/route-eth1.rdu
rename to roles/nfs/client/files/route-eth1.rdu
diff --git a/roles/nfs_client/tasks/main.yml b/roles/nfs/client/tasks/main.yml
similarity index 100%
rename from roles/nfs_client/tasks/main.yml
rename to roles/nfs/client/tasks/main.yml