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>

diff --git a/roles/testnode/tasks/nfs.yml b/roles/testnode/tasks/nfs.yml
new file mode 100644 (file)
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 8b8467321de214db6b80d16a72f36d51be20cbf3..fb1dcd72b67de2265850d663735514a3fb20fbe5 100644 (file)
--- 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 6a6d6683c6fb6472ee6e04113dcfb7b3141e240d..8a4f7e5f1397ff80223a0b2765d4259449561106 100644 (file)
--- 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 c78e93d935f142a4e32ceddabbde6089c41698a7..5662811df008b559feca1cf2723ac0b05a6fc14c 100644 (file)
--- 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