From 71ee08636849e87961de172ad5e6129d096855ad Mon Sep 17 00:00:00 2001
From: Michael Fritch <mfritch@suse.com>
Date: Sat, 1 Feb 2020 23:22:20 -0700
Subject: [PATCH] qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test

Signed-off-by: Michael Fritch <mfritch@suse.com>
---
 qa/workunits/cephadm/test_cephadm.sh | 14 ++++++++++++++
 src/cephadm/cephadm                  |  1 -
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index cc273343631..40a0021cd06 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -277,6 +277,20 @@ cat ${CEPHADM_SAMPLES_DIR}/grafana.json | \
 cond="curl --insecure 'https://localhost:3000' | grep -q 'grafana'"
 is_available "grafana" "$cond" 30
 
+# add nfs-ganesha
+nfs_rados_pool=$(cat ${CEPHADM_SAMPLES_DIR}/nfs.json | jq -r '.["pool"]')
+$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
+        ceph osd pool create $nfs_rados_pool 64
+$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
+        rados --pool nfs-ganesha --namespace nfs-ns create conf-nfs.a
+$CEPHADM deploy --name nfs.a \
+      --fsid $FSID \
+      --keyring $KEYRING \
+      --config $CONFIG \
+      --config-json ${CEPHADM_SAMPLES_DIR}/nfs.json
+cond="$SUDO ss -tlnp '( sport = :nfs )' | grep 'ganesha.nfsd'"
+is_available "nfs" "$cond" 10
+
 ## run
 # WRITE ME
 
diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 38b82cb1233..5b9332aa71c 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -199,7 +199,6 @@ class NFSGanesha(object):
         # type: (str) -> Dict[str, str]
         mounts = dict()
         mounts[os.path.join(data_dir, 'config')] = '/etc/ceph/ceph.conf:z'
-        # TODO: `ceph auth get-or-create` instead of admin keyring?
         mounts[os.path.join(data_dir, 'keyring')] = '/etc/ceph/keyring:z'
         mounts[os.path.join(data_dir, 'etc/ganesha')] = '/etc/ganesha'
         return mounts
-- 
2.39.5