mgr/cephadm: For colocating nfs daeoms, check daemon qos ports instead of fetching...

Fixes: https://tracker.ceph.com/issues/69861
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index bd4625aa5c0f0742eff44f67b4acfb1339a9bcb3..0307be5e189a9427d52da26ad5fff5a2c2351e2e 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -223,6 +223,12 @@ class NFSService(CephService):
             host_ip = self.mgr.inventory.get_addr(host.hostname)
             ceph_nodes.append(host_ip)
 
+        cluster_qos_port = None
+        if daemon_spec.ports and len(daemon_spec.ports) > 2:
+            cluster_qos_port = daemon_spec.ports[2]
+        elif spec.cluster_qos_port:
+            cluster_qos_port = spec.cluster_qos_port
+
         # generate the ganesha config
         rdma_port = None
         if spec.enable_rdma and daemon_spec.ports and len(daemon_spec.ports) > 2:
@@ -242,7 +248,7 @@ class NFSService(CephService):
                 "port": port,
                 "monitoring_addr": monitoring_ip,
                 "monitoring_port": monitoring_port,
-                "cqos_port": spec.cluster_qos_port,
+                "cqos_port": cluster_qos_port,
                 "bind_addr": bind_addr,
                 "haproxy_hosts": [],
                 "nfs_idmap_conf": nfs_idmap_conf,