From a3c726c2267c505e1d8f7e69b9f08c906cc9cdf6 Mon Sep 17 00:00:00 2001 From: Noam Angel Date: Thu, 12 Aug 2021 06:19:04 +0000 Subject: [PATCH] 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 --- tripleoclient/workflows/baremetal.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tripleoclient/workflows/baremetal.py b/tripleoclient/workflows/baremetal.py index a779c6df1..704691064 100644 --- a/tripleoclient/workflows/baremetal.py +++ b/tripleoclient/workflows/baremetal.py @@ -227,11 +227,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) @@ -361,8 +361,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.