xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-23 01:53:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix mistakes in the draft discovery code

Browse Source 
A couple of blatantly obvious mistakes were made that require fixing.
This commit is contained in:
Jarrod Johnson 2018-01-16 12:13:34 -05:00
parent a80ae622f6
commit 8226c2bd77
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,7 +684,7 @@ def get_chained_smm_name(nodename, cfg, handler, nl=None, checkswitch=True):
cd = cfg.get_node_attributes(nodename, ['hardwaremanagement.manager',
'pubkeys.tls_hardwaremanager'])
smmaddr = cd[nodename]['hardwaremanagement.manager']['value']
pkey = cd.get[nodename].get('pubkeys.tls_hardwaremanager', {}).get(
pkey = cd[nodename].get('pubkeys.tls_hardwaremanager', {}).get(
'value', None)
if pkey:
cv = util.TLSCertVerifier(

4
confluent_server/confluent/networking/macmap.py
View File

@ -254,7 +254,9 @@ def find_nodeinfo_by_mac(mac, configmanager):
if mac in _nodesbymac:
return _nodesbymac[mac][0], {'maccount': _nodesbymac[mac][1]}
# If update_mac bailed out, still check one last time
return _nodesbymac.get(mac, (None, {'maccount': 0}))
if mac in _nodesbymac:
return _nodesbymac[mac][0], {'maccount': _nodesbymac[mac][1]}
return None, {'maccount': 0}
mapupdating = eventlet.semaphore.Semaphore()