From: Ramana Raja <rraja@redhat.com>
Date: Sun, 10 Apr 2022 18:18:53 +0000 (-0400)
Subject: mgr/nfs: don't output any message
X-Git-Tag: v18.0.0~969^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99906ea6cef747d8ab6c154ccc884cd4f3187dc2;p=ceph.git

mgr/nfs: don't output any message

... when `nfs cluster create/rm` succeeds. This also fixes the
misleading output message that said NFS cluster creation or
removal was complete when the `nfs cluster create/rm` command
returned. The `nfs cluster create/rm` command triggers the
asynchronous creation/removal of the NFS daemons and ingress
service of the cluster.

Fixes: https://tracker.ceph.com/issues/55299
Signed-off-by: Ramana Raja <rraja@redhat.com>
---

diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py
index 68980cb9cd8ad..4ddc750044eeb 100644
--- a/src/pybind/mgr/nfs/cluster.py
+++ b/src/pybind/mgr/nfs/cluster.py
@@ -121,7 +121,7 @@ class NFSCluster:
 
             if cluster_id not in available_clusters(self.mgr):
                 self._call_orch_apply_nfs(cluster_id, placement, virtual_ip, port)
-                return 0, "NFS Cluster Created Successfully", ""
+                return 0, "", ""
             return 0, "", f"{cluster_id} cluster already exists"
         except Exception as e:
             return exception_handler(e, f"NFS Cluster {cluster_id} could not be created")
@@ -136,7 +136,7 @@ class NFSCluster:
                 completion = self.mgr.remove_service('nfs.' + cluster_id)
                 orchestrator.raise_if_exception(completion)
                 self.delete_config_obj(cluster_id)
-                return 0, "NFS Cluster Deleted Successfully", ""
+                return 0, "", ""
             return 0, "", "Cluster does not exist"
         except Exception as e:
             return exception_handler(e, f"Failed to delete NFS Cluster {cluster_id}")