xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-01 23:16:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'xcat/master'

Browse Source
This commit is contained in:
Jarrod Johnson
2026-08-28 15:50:27 -04:00
parent 054ca63600 66488f3041
commit 306fa83fd7
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_osdeploy/common/profile/scripts/getinstalldisk
+7 -2
View File
@@ -14,7 +14,8 @@ PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit',
'thinksystem m.2',
'thinksystem_m.2',
'thinksystem 7mm',
'thinksystem_7mm',
'thinksystem_7mm',
'thinksystem_7mm_vd',
'b540p-2hs', # 7mm or M.2 in rear
'b540d-2hs', # M.2 in E3.S or 2.5inch
'b550d-2hs', # Front M.2
@@ -29,6 +30,8 @@ PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit',
'raid b545i-2i',
'raid_b545-2i')
BOOT_SLOT_KEYWORDS = ('m.2 socket', '7mm')
class DiskInfo(object):
def __init__(self, devname, slotinfo=None):
if devname.startswith('nvme') and 'c' in devname:
@@ -199,7 +202,9 @@ def get_m2_slot_info():
slots = get_dmi_type9_info()
m2slots = {}
for slot in slots.values():
if 'm.2 socket' not in slot.get('type', '').lower():
label = '{0} {1}'.format(
slot.get('type', ''), slot.get('designation', '')).lower()
if not any(x in label for x in BOOT_SLOT_KEYWORDS):
continue
busaddr = slot.get('bus_address', None)
if not busaddr:
confluent_osdeploy/esxi7/profiles/hypervisor/scripts/getinstalldisk
+2 -1
View File
@@ -73,7 +73,8 @@ PRIORITY_MODELS = ('m.2 nvme 2-bay raid kit',
'thinksystem m.2',
'thinksystem_m.2',
'thinksystem 7mm',
'thinksystem_7mm',
'thinksystem_7mm',
'thinksystem_7mm_vd',
'b540p-2hs', # 7mm or M.2 in rear
'b540d-2hs', # M.2 in E3.S or 2.5inch
'b550d-2hs', # Front M.2