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

Pull UUID into info for rackmount

Browse Source 
UUID was erroneously not pulled.  The block on dense/blade should
only apply to enclosure bay.
This commit is contained in:
Jarrod Johnson 2017-08-11 10:07:42 -04:00
parent 1e54abd29b
commit 38546514e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,10 +28,6 @@ class NodeHandler(bmchandler.NodeHandler):
ff = slpattrs.get('enclosure-form-factor', [''])[0]
except IndexError:
return
if ff not in ('dense-computing', 'BC2'):
# do not probe unless it's a dense platform
return
self.isdense = True
wronguuid = slpattrs.get('node-uuid', [''])[0]
if wronguuid:
# we need to fix the first three portions of the uuid
@ -43,6 +39,10 @@ class NodeHandler(bmchandler.NodeHandler):
self.info['uuid'] = uuidprefix + '-' + '-'.join(
wronguuid.split('-')[3:])
self.info['uuid'] = string.lower(self.info['uuid'])
if ff not in ('dense-computing', 'BC2'):
# do not probe unless it's a dense platform
return
self.isdense = True
slot = int(slpattrs.get('slot', ['0'])[0])
if slot != 0:
self.info['enclosure.bay'] = slot