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 a8151cb2be7a16cc12fce97dcaf1e9224c44e3c7..e86d55ed43d9581ff210b972606193cd2aa5a153 100644 (file)
--- 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 d311a28e12b40bc75b3fd713991fd0a970aa6d53..bfea2bf3ba0d589180786cce3c6d37fd34a2d071 100644 (file)
--- 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 2c88c9d45bcffe5687ecf5a5e5f33758b7a2b542..6416364900e156a60ad0e9b71a6dde1b98061281 100644 (file)
--- 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) }}