Skip to content

Commit e30db29

Browse files
committed
clustersConfig: update autodetect for base url
Rather than detecting the full path to the iso, only detect the base url. The iso file itself will be provided by the user of CDA instead. Signed-off-by: Salvatore Daniele <[email protected]>
1 parent db74855 commit e30db29

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

clusterInfo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def __init__(self, name: str):
1010
self.name = name
1111
self.provision_host = ""
1212
self.network_api_port = ""
13-
self.iso = ""
13+
self.iso_server = ""
1414
self.organization_id = ""
1515
self.activation_key = ""
1616
self.bmc_imc_hostnames = [] # type: list[str]
@@ -53,7 +53,7 @@ def load_all_cluster_info() -> dict[str, ClusterInfo]:
5353
if row["Card type"] == "IPU-Cluster":
5454
cluster.bmc_imc_hostnames.append(row["BMC/IMC hostname"])
5555
cluster.ipu_mac_addresses.append(row["MAC"])
56-
cluster.iso = row["Install ISO"]
56+
cluster.iso_server = row["ISO server"]
5757
cluster.activation_key = row["Activation Key"]
5858
cluster.organization_id = row["Organization ID"]
5959
if row["Provision host"] == "yes":

clustersConfig.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,10 @@ def api_network() -> str:
384384
assert self._cluster_info is not None
385385
return self._cluster_info.network_api_port
386386

387-
def iso() -> str:
387+
def iso_server() -> str:
388388
self._ensure_clusters_loaded()
389389
assert self._cluster_info is not None
390-
return self._cluster_info.iso
390+
return self._cluster_info.iso_server
391391

392392
def activation_key() -> str:
393393
self._ensure_clusters_loaded()
@@ -415,7 +415,7 @@ def ipu_mac_address(a: int) -> str:
415415
template.globals['worker_number'] = worker_number
416416
template.globals['worker_name'] = worker_name
417417
template.globals['api_network'] = api_network
418-
template.globals['iso'] = iso
418+
template.globals['iso_server'] = iso_server
419419
template.globals['bmc'] = bmc
420420
template.globals['activation_key'] = activation_key
421421
template.globals['organization_id'] = organization_id

0 commit comments

Comments
 (0)