From: Sage Weil <sage@newdream.net>
Date: Wed, 26 May 2021 22:38:05 +0000 (-0400)
Subject: mgr/nfs: use host.addr for backend IP where possible
X-Git-Tag: v16.2.5~87^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1e389ce6cda98172e58edef78ec4851e5f72bb6;p=ceph.git

mgr/nfs: use host.addr for backend IP where possible

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 7e9f4ac7a11805b721d3857197b6d04c4cdae45e)
---

diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py
index aac469412b2f..bdba9ce8da03 100644
--- a/src/pybind/mgr/nfs/cluster.py
+++ b/src/pybind/mgr/nfs/cluster.py
@@ -146,9 +146,21 @@ class NFSCluster:
         for cluster in completion.result:
             if self.cluster_id == cluster.service_id():
                 try:
+                    if cluster.ip:
+                        ip = cluster.ip
+                    else:
+                        c = self.mgr.get_hosts()
+                        orchestrator.raise_if_exception(c)
+                        hosts = [h for h in c.result
+                                 if h.hostname == cluster.hostname]
+                        if hosts:
+                            ip = resolve_ip(hosts[0].addr)
+                        else:
+                            # sigh
+                            ip = resolve_ip(cluster.hostname)
                     backends.append({
                             "hostname": cluster.hostname,
-                            "ip": cluster.ip or resolve_ip(cluster.hostname),
+                            "ip": ip,
                             "port": cluster.ports[0]
                             })
                 except orchestrator.OrchestratorError: