diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-06-24 12:57:56 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-06-28 16:47:13 +0200 |
| commit | 1d6441cc347cfe984721f34ebb0cd64fd9e4d876 (patch) | |
| tree | 86205d194b99ad8224e89d8c9f3214a140f16d16 /ironic/drivers/modules/ilo | |
| parent | f67df12021d9bb668be7d2545788c2f58dc94023 (diff) | |
| download | ironic-1d6441cc347cfe984721f34ebb0cd64fd9e4d876.tar.gz | |
Refactor deploy_utils.validate_image_properties
This function has a confusing public interface and is always preceeded
by roughly the same logic, copy-pasted across boot interfaces. Move
this logic inside of the function and streamline its interface.
Change-Id: I4fc63be4e3cd4656d0ca7e893d4f3a98c07a8b4c
Diffstat (limited to 'ironic/drivers/modules/ilo')
| -rw-r--r-- | ironic/drivers/modules/ilo/boot.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py index 5c8734cda..32b0f9a1c 100644 --- a/ironic/drivers/modules/ilo/boot.py +++ b/ironic/drivers/modules/ilo/boot.py @@ -246,14 +246,7 @@ def _validate_instance_image_info(task): node = task.node d_info = _parse_deploy_info(node) - - if node.driver_internal_info.get('is_whole_disk_image'): - props = [] - elif service_utils.is_glance_image(d_info['image_source']): - props = ['kernel_id', 'ramdisk_id'] - else: - props = ['kernel', 'ramdisk'] - deploy_utils.validate_image_properties(task.context, d_info, props) + deploy_utils.validate_image_properties(task, d_info) def _disable_secure_boot(task): @@ -920,14 +913,7 @@ class IloUefiHttpsBoot(base.BootInterface): d_info = deploy_utils.get_image_instance_info(node) self._validate_hrefs(d_info) - - if node.driver_internal_info.get('is_whole_disk_image'): - props = [] - elif service_utils.is_glance_image(d_info['image_source']): - props = ['kernel_id', 'ramdisk_id'] - else: - props = ['kernel', 'ramdisk'] - deploy_utils.validate_image_properties(task.context, d_info, props) + deploy_utils.validate_image_properties(task, d_info) @METRICS.timer('IloUefiHttpsBoot.validate') def validate(self, task): |