From aef952bc4691ba357ab3f5da69817b5bf581f1e2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 20 Oct 2021 15:38:27 -0400 Subject: [PATCH] mgr/nfs: use keyword args for 'nfs export create rgw' Signed-off-by: Sage Weil --- doc/mgr/nfs.rst | 12 ++++++------ ...-ingress-rgw.yaml => nfs-ingress-rgw-bucket.yaml} | 2 +- src/vstart.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename qa/suites/orch/cephadm/smoke-roleless/2-services/{nfs-ingress-rgw.yaml => nfs-ingress-rgw-bucket.yaml} (95%) diff --git a/doc/mgr/nfs.rst b/doc/mgr/nfs.rst index 52ddf104fd8fc..548f7b62da780 100644 --- a/doc/mgr/nfs.rst +++ b/doc/mgr/nfs.rst @@ -275,24 +275,24 @@ To export a bucket .. code:: - $ ceph nfs export create rgw [--readonly] [--client_addr ...] [--squash ] + $ ceph nfs export create rgw --cluster-id --pseudo-path --bucket [--readonly] [--client_addr ...] [--squash ] For example, to export *mybucket* via NFS cluster *mynfs* at the pseudo-path */bucketdata* to any host in the ``192.168.10.0/24`` network .. code:: - $ ceph nfs export create rgw mybucket mynfs /bucketdata --client_addr 192.168.10.0/24 + $ ceph nfs export create rgw --cluster-id mynfs --pseudo-path /bucketdata --bucket mybucket --client_addr 192.168.10.0/24 .. note:: Export creation is supported only for NFS Ganesha clusters deployed using nfs interface. -```` is the name of the bucket that will be exported. - -.. note:: Currently, if multi-site RGW is enabled, Ceph can only export RGW buckets in the default realm. - ```` is the NFS Ganesha cluster ID. ```` is the export position within the NFS v4 Pseudo Filesystem where the export will be available on the server. It must be an absolute path and unique. +```` is the name of the bucket that will be exported. + +.. note:: Currently, if multi-site RGW is enabled, Ceph can only export RGW buckets in the default realm. + ```` is the list of client address for which these export permissions will be applicable. By default all clients can access the export according to specified export permissions. See the `NFS-Ganesha Export Sample`_ diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml similarity index 95% rename from qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw.yaml rename to qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml index 8e18c5906c31c..3f4964978d929 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml @@ -40,7 +40,7 @@ tasks: - cephadm.shell: host.a: - - ceph nfs export create rgw foobucket foo --pseudo-path /foobucket + - ceph nfs export create rgw --bucket foobucket --cluster-id foo --pseudo-path /foobucket - cephadm.wait_for_service: service: nfs.foo diff --git a/src/vstart.sh b/src/vstart.sh index 0fa55eba02ed9..2b6a4017afab7 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -1670,7 +1670,7 @@ if [ $GANESHA_DAEMON_NUM -gt 0 ]; then if [ "$CEPH_NUM_RGW" -gt 0 ]; then pseudo_path="/rgw" do_rgw_create_bucket - prun ceph_adm nfs export create rgw "nfs-bucket" $cluster_id $pseudo_path + prun ceph_adm nfs export create rgw --cluster-id $cluster_id --pseudo-path $pseudo_path --bucket "nfs-bucket" echo "Mount using: mount -t nfs -o port=$port $IP:$pseudo_path mountpoint" fi else -- 2.39.5