From: Guillaume Abrioux <gabrioux@ibm.com>
Date: Mon, 12 Feb 2024 16:20:42 +0000 (+0000)
Subject: mgr/cephadm: conditionally deploy node-proxy
X-Git-Tag: v18.2.4~275^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c0d90190121cdc164e15879b1919cd44d170351;p=ceph.git

mgr/cephadm: conditionally deploy node-proxy

Only attempt to deploy the node-proxy agent when oob details
are provided for a given host.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 3ae32c44a7d1ea15bd3459a266b2dbf3c9f9a408)
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index e92407ec80a..21713960dae 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -888,6 +888,13 @@ class CephadmServe:
                         hosts_altered.add(d.hostname)
                         break
 
+                # do not attempt to deploy node-proxy agent when oob details are not provided.
+                if slot.daemon_type == 'node-proxy' and slot.hostname not in self.mgr.node_proxy_cache.oob.keys():
+                    self.log.debug(
+                        f'Not deploying node-proxy agent on {slot.hostname} as oob details are not present.'
+                    )
+                    continue
+
                 # deploy new daemon
                 daemon_id = slot.name