From 87d95a0917a389f4c8bbf1182fbc98bcf60d18d9 Mon Sep 17 00:00:00 2001
From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 13 Apr 2015 14:46:11 -0500
Subject: [PATCH] Move nfs related tasks into nfs.yml.

I needed this for ubuntu as well as rhel 7.  So, put it in a place
where they can both use the same code.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---
 roles/testnode/tasks/nfs.yml             | 10 ++++++++++
 roles/testnode/tasks/redhat/rhel_7.0.yml | 10 +---------
 roles/testnode/tasks/setup-ubuntu.yml    |  4 ++++
 roles/testnode/vars/apt_systems.yml      |  1 +
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 roles/testnode/tasks/nfs.yml

diff --git a/roles/testnode/tasks/nfs.yml b/roles/testnode/tasks/nfs.yml
new file mode 100644
index 0000000..ea8a789
--- /dev/null
+++ b/roles/testnode/tasks/nfs.yml
@@ -0,0 +1,10 @@
+---
+- name: Upload a dummy nfs export so that the nfs kernel server starts.
+  template:
+    src: exports
+    dest: /etc/exports
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - start nfs-server
diff --git a/roles/testnode/tasks/redhat/rhel_7.0.yml b/roles/testnode/tasks/redhat/rhel_7.0.yml
index 8b84673..fb1dcd7 100644
--- a/roles/testnode/tasks/redhat/rhel_7.0.yml
+++ b/roles/testnode/tasks/redhat/rhel_7.0.yml
@@ -1,13 +1,5 @@
 ---
-- name: Upload a dummy nfs export so that the nfs kernel server starts.
-  template:
-    src: ../../templates/exports
-    dest: /etc/exports
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - start nfs-server
+- include: ../nfs.yml
   tags:
     - nfs
 
diff --git a/roles/testnode/tasks/setup-ubuntu.yml b/roles/testnode/tasks/setup-ubuntu.yml
index 6a6d668..8a4f7e5 100644
--- a/roles/testnode/tasks/setup-ubuntu.yml
+++ b/roles/testnode/tasks/setup-ubuntu.yml
@@ -112,3 +112,7 @@
     # isn't found the file is left unchanged
     backrefs: yes
     state: present
+
+- include: nfs.yml
+  tags:
+    - nfs
diff --git a/roles/testnode/vars/apt_systems.yml b/roles/testnode/vars/apt_systems.yml
index c78e93d..5662811 100644
--- a/roles/testnode/vars/apt_systems.yml
+++ b/roles/testnode/vars/apt_systems.yml
@@ -1,6 +1,7 @@
 ---
 ntp_service_name: ntp
 ssh_service_name: ssh
+nfs_service: nfs-kernel-server
 
 ceph_packages:
   - ceph
-- 
2.39.5