stable-2.2: 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, setting its default to "admin" (which
preserves the prior behavior of always connecting as client.admin).

Backport of #1911.

diff --git a/roles/ceph-common/templates/ganesha.conf.j2 b/roles/ceph-common/templates/ganesha.conf.j2
index 17e2381ddbd2035955b58f12032c04bfac1ffea3..6abe3e390470d3c7f5d07000d02e1ac24b0d56cc 100644 (file)
--- a/roles/ceph-common/templates/ganesha.conf.j2
+++ b/roles/ceph-common/templates/ganesha.conf.j2
@@ -20,6 +20,7 @@ EXPORT
 
        FSAL {
                Name = CEPH;
+               User_Id = "{{ ceph_nfs_ceph_user }}";
        }
 }
 {% endif %}

diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index 509d38bc1c739675d2618b27be626a0e1f9e7eeb..2ba3636827a27aea0ee063f0ed84f0cfbd543d44 100644 (file)
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -37,6 +37,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 #