openstack
/
python-tripleoclient
Code Issues Proposed changes

Restore kernel and ramdisk arguments to node configure 

this change fixing a bug with "openstack overcloud node configure" cli. running the mentioned
command with or without "--deploy-kernel" "--deploy-ramdisk" will result with baremetals which does
not have any kernel and ramdisk setted

Change-Id: Iba653b7990d26041bde2f725b99a68c96c803ff1
Closes-Bug: #1939624
(cherry picked from commit a3c726c226)
This commit is contained in:
Noam Angel 2021-08-12 06:19:04 +00:00
parent 7de125711d
commit e81ced6fa9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/workflows/baremetal.py
View File

@ -230,11 +230,11 @@ def introspect_manageable_nodes(clients, run_validations, concurrency,
def _configure_boot(clients, node_uuid,
kernel_name='bm-deploy-kernel',
ramdisk_name='bm-deploy-ramdisk',
kernel_name=None,
ramdisk_name=None,
instance_boot_option=None):
baremetal_client = clients.baremetal
image_ids = {'kernel': None, 'ramdisk': None}
image_ids = {'kernel': kernel_name, 'ramdisk': ramdisk_name}
node = baremetal_client.node.get(node_uuid)
capabilities = node.properties.get('capabilities', {})
capabilities = node_utils.capabilities_to_dict(capabilities)
@ -364,8 +364,8 @@ def _apply_root_device_strategy(clients, node_uuid, strategy,
{'node': node.uuid, 'dev': root_device, 'local_gb': new_size})
def configure(clients, node_uuids, kernel_name='bm-deploy-kernel',
ramdisk_name='bm-deploy-ramdisk', instance_boot_option=None,
def configure(clients, node_uuids, kernel_name=None,
ramdisk_name=None, instance_boot_option=None,
root_device=None, root_device_minimum_size=4,
overwrite_root_device_hints=False):
"""Configure Node boot options.