From e38cd5d3e56ef0621f5449501719c810975ff096 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 15 Mar 2024 15:50:58 -0400 Subject: [PATCH] Fallback to unverified noderange on candidate manager check in PXE When doing pxe and the noderange of the candidate managers fails, try again without validation in case the user omitted collective members from nodelist, but still used ',' to enumerate them. --- confluent_server/confluent/discovery/protocols/pxe.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/discovery/protocols/pxe.py b/confluent_server/confluent/discovery/protocols/pxe.py index a9a07963..ff473ebc 100644 --- a/confluent_server/confluent/discovery/protocols/pxe.py +++ b/confluent_server/confluent/discovery/protocols/pxe.py @@ -587,7 +587,10 @@ def get_deployment_profile(node, cfg, cfd=None): return None candmgrs = cfd.get(node, {}).get('collective.managercandidates', {}).get('value', None) if candmgrs: - candmgrs = noderange.NodeRange(candmgrs, cfg).nodes + try: + candmgrs = noderange.NodeRange(candmgrs, cfg).nodes + except Exception: # fallback to unverified noderange + candmgrs = noderange.NodeRange(candmgrs).nodes if collective.get_myname() not in candmgrs: return None return profile