From 72e32ae0bf1f060aaabd88ddb9c8dd000c0c5d97 Mon Sep 17 00:00:00 2001 From: Florian Haas Date: Fri, 15 Sep 2017 17:38:19 +0200 Subject: [PATCH] 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. --- roles/ceph-common/templates/ganesha.conf.j2 | 1 + roles/ceph-nfs/defaults/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/ceph-common/templates/ganesha.conf.j2 b/roles/ceph-common/templates/ganesha.conf.j2 index 17e2381dd..6abe3e390 100644 --- 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 509d38bc1..2ba363682 100644 --- 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 #