xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-04-15 09:39:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix XCC discovery with Whitley changes

Browse Source
This commit is contained in:
Jarrod Johnson 2021-01-12 11:47:02 -05:00
parent d27ef81e32
commit a738b761b4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_server/confluent/discovery/handlers/xcc.py
View File

@ -69,11 +69,13 @@ class NodeHandler(immhandler.NodeHandler):
if ff not in ('dense-computing', [u'dense-computing']):
# skip preconfig for non-SD530 servers
return
currfirm = self.info.get('attributes', {}).get('firmware-image-info', [''])[0]
if not currfirm.startswith('TEI'):
return
self.trieddefault = None # Reset state on a preconfig attempt
# attempt to enable SMM
#it's normal to get a 'not supported' (193) for systems without an SMM
# need to branch on 3.00+ firmware
currfirm = self.info.get('attributes', {}).get('firmware-image-info', [''])[0]
currfirm = currfirm.split(':')
if len(currfirm) > 1:
currfirm = float(currfirm[1])
@ -322,11 +324,11 @@ class NodeHandler(immhandler.NodeHandler):
wc.grab_json_response('/api/function',
{'USER_UserPassChange': '{0},{1}'.format(uid, passwd)})
if username != 'USERID':
rsp, status = wc.grab_json_response(
rsp, status = wc.grab_json_response_with_status(
'/api/function',
{'USER_UserModify': '{0},{1},,1,4,0,0,0,0,,8,'.format(uid, username)})
if status == 200 and rsp.get('return', 0) == 762:
rsp, status = wc.grab_json_response(
rsp, status = wc.grab_json_response_with_status(
'/api/function',
{'USER_UserModify': '{0},{1},,1,Administrator,0,0,0,0,,8,'.format(uid, username)})
self.tmppasswd = None