From: Andy McCrae <andy.mccrae@gmail.com>
Date: Wed, 21 Feb 2018 08:41:27 +0000 (+0000)
Subject: Revert "[TEST] Test setting up correct systemd file for nfs-ganesha"
X-Git-Tag: v3.1.0beta3~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c33dae7509b9b565fc77f3af1cfea35d48e609d1;p=ceph-ansible.git

Revert "[TEST] Test setting up correct systemd file for nfs-ganesha"

The nfs-ganesha package has been fixed as part of this commit:
https://github.com/nfs-ganesha/nfs-ganesha-debian/commit/963b6681dfac459c27c947cb8decc788bc9e5422

Once the package is rebuilt this should be good to merge.

This reverts commit e88af3c4cb314f1f640447ebdce343f0aca85fb4.
---

diff --git a/roles/ceph-nfs/tasks/start_nfs.yml b/roles/ceph-nfs/tasks/start_nfs.yml
index c0dc25945..bfd3266e4 100644
--- a/roles/ceph-nfs/tasks/start_nfs.yml
+++ b/roles/ceph-nfs/tasks/start_nfs.yml
@@ -68,13 +68,6 @@
   notify:
     - restart ceph nfss
 
-- name: copy over nfs-ganesha-lock.service file
-  shell: "cp /lib/systemd/system/nfs-ganesha-lock.service.debian8 /lib/systemd/system/nfs-ganesha-lock.service"
-  when:
-    - ansible_distribution == 'Ubuntu'
-    - not containerized_deployment
-    - ceph_nfs_enable_service
-
 - name: systemd start nfs container
   systemd:
     name: ceph-nfs@{{ ceph_nfs_service_suffix | default(ansible_hostname) }}