From d27ef81e32bb82ddda4363d805fc06a250cadb84 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 11 Jan 2021 13:33:26 -0500 Subject: [PATCH] Fix PXE handling of candidate managers --- confluent_server/confluent/discovery/protocols/pxe.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/discovery/protocols/pxe.py b/confluent_server/confluent/discovery/protocols/pxe.py index d1bf4043..0882e737 100644 --- a/confluent_server/confluent/discovery/protocols/pxe.py +++ b/confluent_server/confluent/discovery/protocols/pxe.py @@ -428,8 +428,9 @@ def remap_nodes(nodeattribs, configmanager): macmap[updates[node][attrib]['value'].lower()] = node -def get_deployment_profile(node, cfg): - cfd = cfg.get_node_attributes(node, ('deployment.*')) +def get_deployment_profile(node, cfg, cfd=None): + if not cfd: + cfd = cfg.get_node_attributes(node, ('deployment.*')) profile = cfd.get(node, {}).get('deployment.pendingprofile', {}).get('value', None) if not profile: return None @@ -445,7 +446,8 @@ myipbypeer = {} def check_reply(node, info, packet, sock, cfg, reqview): httpboot = info['architecture'] == 'uefi-httpboot' replen = 275 # default is going to be 286 - profile = get_deployment_profile(node, cfg) + cfd = cfg.get_node_attributes(node, ('deployment.*')) + profile = get_deployment_profile(node, cfg, cfd) if not profile: return myipn = info['netinfo']['recvip']