From 14897d672c083c50906bf9a13af9e2f7ed3e793e Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 23 Oct 2023 15:28:35 +0000 Subject: [PATCH] node-proxy: parametrize idrac port This adds the missing piece to make the idrac port a parameter that one can customize. Signed-off-by: Guillaume Abrioux (cherry picked from commit 69f1272cbf036f8388398093def5136f420635f5) --- src/cephadm/cephadm.py | 2 ++ src/cephadm/cephadmlib/node_proxy/baseredfishsystem.py | 3 ++- src/cephadm/cephadmlib/node_proxy/main.py | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 313e52b49a6..83952b18255 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -4937,6 +4937,8 @@ WantedBy=ceph-{fsid}.target 'ssl_crt_path': self.listener_cert_path, 'ssl_key_path': self.listener_key_path } + if result_json['result'].get('port'): + kwargs['port'] = result_json['result']['port'] self.t_node_proxy = NodeProxy(**kwargs) self.t_node_proxy.start() diff --git a/src/cephadm/cephadmlib/node_proxy/baseredfishsystem.py b/src/cephadm/cephadmlib/node_proxy/baseredfishsystem.py index 76edee0b251..ccf61e9cf87 100644 --- a/src/cephadm/cephadmlib/node_proxy/baseredfishsystem.py +++ b/src/cephadm/cephadmlib/node_proxy/baseredfishsystem.py @@ -15,10 +15,11 @@ class BaseRedfishSystem(BaseSystem): self.chassis_endpoint: str = kw.get('chassis_endpoint', '/Chassis/System.Embedded.1') self.log = Logger(__name__) self.host: str = kw['host'] + self.port: int = kw['port'] self.username: str = kw['username'] self.password: str = kw['password'] # move the following line (class attribute?) - self.client = RedFishClient(host=self.host, username=self.username, password=self.password) + self.client = RedFishClient(host=self.host, port=self.port, username=self.username, password=self.password) self.log.logger.info(f"redfish system initialization, host: {self.host}, user: {self.username}") self.run: bool = False diff --git a/src/cephadm/cephadmlib/node_proxy/main.py b/src/cephadm/cephadmlib/node_proxy/main.py index 8d3da58369c..cd36639bd1f 100644 --- a/src/cephadm/cephadmlib/node_proxy/main.py +++ b/src/cephadm/cephadmlib/node_proxy/main.py @@ -211,6 +211,7 @@ class NodeProxy(Thread): self.log.logger.info(f"Server initialization...") try: self.system = RedfishDellSystem(host=self.__dict__['host'], + port=self.__dict__.get('port', 443), username=self.__dict__['username'], password=self.__dict__['password'], config=self.config) -- 2.39.5