From 0d06eedc814ac35def956377ece9f6924bc3e3be Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 28 Feb 2018 11:53:03 -0500 Subject: [PATCH] Move curruuid up so it is always set If detected pre-discovered, curruuid was not being set correctly --- confluent_server/confluent/discovery/core.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py index f25519ae..24562f2a 100644 --- a/confluent_server/confluent/discovery/core.py +++ b/confluent_server/confluent/discovery/core.py @@ -972,6 +972,7 @@ def discover_node(cfg, handler, info, nodename, manual): # the pubkeys, which is deferred for a little bit # Also, 'secure', when we have the needed infrastructure done # in some product or another. + curruuid = info.get('uuid', False) if 'pxe' in policies and info['handler'] == pxeh: return do_pxe_discovery(cfg, handler, info, manual, nodename, policies) elif ('permissive' in policies and handler.https_supported and lastfp and @@ -1002,10 +1003,8 @@ def discover_node(cfg, handler, info, nodename, manual): traceback.print_exc() return False newnodeattribs = {} - curruuid = False if 'uuid' in info: newnodeattribs['id.uuid'] = info['uuid'] - curruuid = info['uuid'] if 'serialnumber' in info: newnodeattribs['id.serial'] = info['serialnumber'] if 'modelnumber' in info: