From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 3 Jun 2019 19:28:39 +0000 (-0400)
Subject: ceph-nfs: use template module for configuration
X-Git-Tag: v4.0.0rc9~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8bcbacdbb570eaf8ccb60749949fffd778a20f4;p=ceph-ansible.git

ceph-nfs: use template module for configuration

789cef7 introduces a regression in the ganesha configuration file
generation. The new config_template module version broke it.
But the ganesha.conf file isn't an ini file and doesn't really
need to use the config_template module. Instead we can use the
classic template module.

Resolves: #4045

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 616c4846980bc01144417416d60fd9bb46aa14a9)
---

diff --git a/roles/ceph-nfs/tasks/start_nfs.yml b/roles/ceph-nfs/tasks/start_nfs.yml
index 419ba3daa..28a5ea255 100644
--- a/roles/ceph-nfs/tasks/start_nfs.yml
+++ b/roles/ceph-nfs/tasks/start_nfs.yml
@@ -31,14 +31,12 @@
     mode: "0755"
 
 - name: generate ganesha configuration file
-  action: config_template
-  args:
+  template:
     src: "ganesha.conf.j2"
     dest: /etc/ganesha/ganesha.conf
     owner: "root"
     group: "root"
     mode: "0644"
-    config_type: ini
   notify: restart ceph nfss
 
 - name: create exports directory