parallelvirtualcluster/pvc-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Increase timeout to 61 and sort NICs

Browse Source
This commit is contained in:
Joshua Boniface
2022-07-06 16:08:36 +00:00
parent 5832b7f1d3
commit 7d92dae744
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap-daemon/pvcbootstrapd/lib/redfish.py
View File

@@ -86,7 +86,7 @@ class RedfishSession:
login_response = None login_response = None
tries = 1 tries = 1
max_tries = 31 max_tries = 61
while tries < max_tries: while tries < max_tries:
logger.info(f"Trying to log in to Redfish ({tries}/{max_tries - 1})...") logger.info(f"Trying to log in to Redfish ({tries}/{max_tries - 1})...")
try: try:
@@ -748,7 +748,9 @@ def redfish_init(config, cspec, data):
try: try:
ethernet_root = system_detail["EthernetInterfaces"]["@odata.id"].rstrip("/") ethernet_root = system_detail["EthernetInterfaces"]["@odata.id"].rstrip("/")
ethernet_detail = session.get(ethernet_root) ethernet_detail = session.get(ethernet_root)
first_interface_root = ethernet_detail["Members"][0]["@odata.id"].rstrip("/") embedded_ethernet_detail_members = [e for e in ethernet_detail["Members"] if "Embedded" in e["@odata.id"]]
embedded_ethernet_detail_members.sort(key = lambda k: k["@odata.id"])
first_interface_root = embedded_ethernet_detail_members[0]["@odata.id"].rstrip("/")
first_interface_detail = session.get(first_interface_root) first_interface_detail = session.get(first_interface_root)
# Something went wrong, so fall back # Something went wrong, so fall back
except KeyError: except KeyError: