From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 21 Nov 2019 15:39:42 +0000 (+0100)
Subject: nfs: remove legacy file
X-Git-Tag: v6.0.0alpha1~208
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33bfb10af993faf97a976972f47344ab7ba51edf;p=ceph-ansible.git

nfs: remove legacy file

this file is provided by the packaging (nfs-ganesha) so there's no need
to maintain it in ceph-ansible

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/roles/ceph-nfs/files/org.ganesha.nfsd.conf b/roles/ceph-nfs/files/org.ganesha.nfsd.conf
deleted file mode 100644
index 8d952b0ab..000000000
--- a/roles/ceph-nfs/files/org.ganesha.nfsd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="org.ganesha.nfsd"/>
-    <allow send_destination="org.ganesha.nfsd"/>
-
-    <allow send_destination="org.ganesha.nfsd"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-
-    <allow send_destination="org.ganesha.nfsd"
-           send_interface="org.ganesha.nfsd.CBSIM"/>
-
-    <allow send_destination="org.ganesha.nfsd"
-           send_interface="org.ganesha.nfsd.admin"/>
-  </policy>
-</busconfig>
diff --git a/roles/ceph-nfs/tasks/pre_requisite_container.yml b/roles/ceph-nfs/tasks/pre_requisite_container.yml
index 2c96d6523..8112a8e21 100644
--- a/roles/ceph-nfs/tasks/pre_requisite_container.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_container.yml
@@ -26,16 +26,3 @@
         - item.item.copy_key | bool
   when: groups.get(mon_group_name, []) | length > 0
 
-- name: dbus related tasks
-  block:
-    - name: create dbus service file
-      copy:
-        src: "org.ganesha.nfsd.conf"
-        dest: /etc/dbus-1/system.d/org.ganesha.nfsd.conf
-        owner: "root"
-        group: "root"
-        mode: "0644"
-
-    - name: reload dbus configuration
-      command: "killall -SIGHUP dbus-daemon"
-  when: ceph_nfs_dynamic_exports | bool