xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 19:10:10 +00:00
Code Issues Projects Releases Wiki Activity

Move curruuid up so it is always set

Browse Source 
If detected pre-discovered, curruuid was not being set correctly
This commit is contained in:
Jarrod Johnson 2018-02-28 11:53:03 -05:00
parent ca27385eaa
commit 0d06eedc81
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
confluent_server/confluent/discovery/core.py
View File

@ -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: