node-proxy: parametrize reporter url

node-proxy entrypoint (`server.main()`) now takes two parameters
(addr / port) in order to make the reporter agent know how to reach
the http agent endpoint hosted in the mgr daemon.

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

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 81149b342efc480ce382e5ab86280f0519a84458..8826aa68dc6b32372f3fd701cba025f6e77d8025 100755 (executable)
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -4932,7 +4932,9 @@ WantedBy=ceph-{fsid}.target
                               kwargs={'host': result_json['result']['addr'],
                                       'username': result_json['result']['username'],
                                       'password': result_json['result']['password'],
-                                      'data': node_proxy_data})
+                                      'data': node_proxy_data,
+                                      'mgr_target_ip': self.target_ip,
+                                      'mgr_target_port': self.target_port})
         t_node_proxy.start()
 
         try:

diff --git a/src/cephadm/cephadmlib/node_proxy/server.py b/src/cephadm/cephadmlib/node_proxy/server.py
index 54396f445ddaac7f0c83ef6ce9db946c3e57aed1..78d1e7065a963955025a4ab6497ba4a776747937 100644 (file)
--- a/src/cephadm/cephadmlib/node_proxy/server.py
+++ b/src/cephadm/cephadmlib/node_proxy/server.py
@@ -190,7 +190,9 @@ class API:
 def main(host: str = '',
          username: str = '',
          password: str = '',
-         data: str = '') -> None:
+         data: str = '',
+         mgr_target_ip: str = '',
+         mgr_target_port: str = '') -> None:
     # TODO: add a check and fail if host/username/password/data aren't passed
 
     # parser = argparse.ArgumentParser(
@@ -221,7 +223,7 @@ def main(host: str = '',
                          password=password,
                          system_endpoint='/Systems/System.Embedded.1',
                          config=config)
-    reporter_agent = Reporter(system, data, config.__dict__['reporter']['endpoint'])
+    reporter_agent = Reporter(system, data, f"https://{mgr_target_ip}:{mgr_target_port}/node-proxy/data")
     cherrypy.config.update({
         'node_proxy': config,
         'server.socket_port': config.__dict__['server']['port']