From 7e9f4ac7a11805b721d3857197b6d04c4cdae45e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 May 2021 18:38:05 -0400 Subject: [PATCH] mgr/nfs: use host.addr for backend IP where possible Signed-off-by: Sage Weil --- src/pybind/mgr/nfs/cluster.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py index aac469412b2f5..bdba9ce8da038 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: -- 2.39.5