xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-28 08:11:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for certificate directed discovery

Browse Source
This commit is contained in:
Jarrod Johnson 2023-02-01 13:09:40 -05:00
parent 3e747069d9
commit 8cf97833ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1182,8 +1182,8 @@ def search_smms_by_cert(currsmm, cert, cfg):
nl = list(
cfg.filter_node_attributes('enclosure.bay={}'.format(bay), nl))
if len(nl) == 1:
return currsmm, port, nl[0]
return currsmm, port, None
return currsmm, bay, nl[0]
return currsmm, bay, None
exnl = list(cfg.filter_node_attrubutes('enclosure.extends=' + currsmm))
if len(exnl) == 1:
return search_smms_by_cert(exnl[0], cert, cfg)
@ -1228,7 +1228,7 @@ def eval_node(cfg, handler, info, nodename, manual=False):
info['verfied'] = True
info['enclosure.bay'] = match[1]
if match[2]:
if not discover_node(cfg, handler, info, match[2]):
if not discover_node(cfg, handler, info, match[2], manual):
pending_nodes[match[2]] = nodename
return
if 'enclosure.bay' not in info: