xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-11-12 11:06:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #321 from Obihoernchen/fix/deployment-storage-devname

Browse Source 
Accept plain device names in deployment.storage and fail on no match
This commit is contained in:
Jarrod Johnson
2026-10-30 07:54:16 -04:00
committed by GitHub
parent 0c57184ef1 4aa6bf8af5
commit ece4483d38
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_osdeploy/common/profile/scripts/getinstalldisk
+26 -24
View File
@@ -241,31 +241,33 @@ def get_deployment_storage():
def filter_deployment_storage(disks, storagespec, slotinfo=None):
if not storagespec:
return disks
spec = storagespec.strip().lower()
for disk in list(disks):
if spec == 'm2':
if disk.is_m2:
continue
if disk.model.lower() in PRIORITY_MODELS:
continue
if slotinfo is None:
slotinfo = get_m2_slot_info()
if not getattr(disk, 'busaddr', None):
for kernname in getattr(disk, 'kernnames', []):
if kernname in slotinfo:
break
else:
disks.remove(disk)
continue
if disk.busaddr not in slotinfo:
disks.remove(disk)
elif spec.startswith('/dev/'):
bspec = os.path.basename(spec)
if disk.name.lower() == bspec:
spec = storagespec.strip()
if spec.lower() != 'm2':
# A device name with or without /dev/, or a persistent link such as
# /dev/disk/by-path/..., resolved to its kernel name
if spec.startswith('/dev/'):
spec = os.path.realpath(spec)
devname = os.path.basename(spec).lower()
for disk in disks:
if disk.name.lower() == devname:
return [disk]
else:
raise Exception("Unknown deployment.storage specification: {0}".format(storagespec))
raise Exception("No disks match deployment.storage specification: {0}".format(storagespec))
for disk in list(disks):
if disk.is_m2:
continue
if disk.model.lower() in PRIORITY_MODELS:
continue
if slotinfo is None:
slotinfo = get_m2_slot_info()
if not getattr(disk, 'busaddr', None):
for kernname in getattr(disk, 'kernnames', []):
if kernname in slotinfo:
break
else:
disks.remove(disk)
continue
if disk.busaddr not in slotinfo:
disks.remove(disk)
if not disks:
raise Exception("No disks match deployment.storage specification: {0}".format(storagespec))
return disks
confluent_server/confluent/config/attributes.py
+1 -1
View File
@@ -256,7 +256,7 @@ node = {
'description': ('Timestamp of last state change, as reported by an OS profile, when available'),
},
'deployment.storage': {
'description': ('Indicates the storage to use for OS deployment. This may be a specific device name, or a more generic description such as "m2" to indicate that the OS should be deployed to an M.2 device. If not specified, the default behavior is to prioritize according to various criteria and use the first disk based on that evaluation.'),
'description': ('Indicates the storage to use for OS deployment. This may be a specific device name (for example nvme0n1 or /dev/nvme0n1), a persistent device link such as /dev/disk/by-path/..., or a more generic description such as "m2" to indicate that the OS should be deployed to an M.2 device. The deployment fails if no disk matches. If not specified, the default behavior is to prioritize according to various criteria and use the first disk based on that evaluation.'),
},
'deployment.useinsecureprotocols': {
'description': ('What phase(s) of boot are permitted to use insecure protocols '