From: Florian Haas <florian@hastexo.com>
Date: Fri, 15 Sep 2017 15:38:19 +0000 (+0200)
Subject: Introduce ceph_nfs_ceph_user
X-Git-Tag: v3.0.0rc10~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1911%2Fhead;p=ceph-ansible.git

Introduce ceph_nfs_ceph_user

In analogy to ceph_nfs_rgw_user, we should be able to define a user
with which the nfs-ganesha Ceph FSAL connects to the cluster.

Introduce a ceph_nfs_ceph_user variable, setting its default to
"admin" (which preserves the prior behavior of always connecting as
client.admin).

Fixes #1910.
---

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index a8151cb2b..e86d55ed4 100644
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -44,6 +44,7 @@ dummy:
 #ceph_nfs_ceph_pseudo_path: "/cephobject"
 #ceph_nfs_ceph_protocols: "3,4"
 #ceph_nfs_ceph_access_type: "RW"
+#ceph_nfs_ceph_user: "admin"
 
 ###################
 # FSAL RGW Config #
diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index d311a28e1..bfea2bf3b 100644
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -36,6 +36,7 @@ ceph_nfs_ceph_export_id: 20134
 ceph_nfs_ceph_pseudo_path: "/cephobject"
 ceph_nfs_ceph_protocols: "3,4"
 ceph_nfs_ceph_access_type: "RW"
+ceph_nfs_ceph_user: "admin"
 
 ###################
 # FSAL RGW Config #
diff --git a/roles/ceph-nfs/templates/ganesha.conf.j2 b/roles/ceph-nfs/templates/ganesha.conf.j2
index 2c88c9d45..641636490 100644
--- a/roles/ceph-nfs/templates/ganesha.conf.j2
+++ b/roles/ceph-nfs/templates/ganesha.conf.j2
@@ -20,6 +20,7 @@ EXPORT
 
 	FSAL {
 		Name = CEPH;
+		User_Id = "{{ ceph_nfs_ceph_user }}";
 	}
 
         {{ ganesha_ceph_export_overrides | default(None) }}