diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-06 12:07:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-06 12:07:02 +0000 |
| commit | 3709cce11f696f324f501090d050273a1fcb4a70 (patch) | |
| tree | 555efb2eeba41b38fea73267121723cdc5228778 /devstack/lib | |
| parent | c2db0bbac30eb676a652abbb38fda72a6a43a71a (diff) | |
| parent | 9e7f1cb57024b2ef44c778dd1dcf183294503901 (diff) | |
| download | ironic-3709cce11f696f324f501090d050273a1fcb4a70.tar.gz | |
Merge "ISO ramdisk virtual media test enablement"
Diffstat (limited to 'devstack/lib')
| -rw-r--r-- | devstack/lib/ironic | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index a57f85d6f..831821ff1 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -194,7 +194,7 @@ IRONIC_DRIVER_INTERFACE_TYPES="bios boot power management deploy console inspect IRONIC_ENABLED_BIOS_INTERFACES=${IRONIC_ENABLED_BIOS_INTERFACES:-"fake,no-bios"} IRONIC_ENABLED_BOOT_INTERFACES=${IRONIC_ENABLED_BOOT_INTERFACES:-"fake,ipxe"} IRONIC_ENABLED_CONSOLE_INTERFACES=${IRONIC_ENABLED_CONSOLE_INTERFACES:-"fake,no-console"} -IRONIC_ENABLED_DEPLOY_INTERFACES=${IRONIC_ENABLED_DEPLOY_INTERFACES:-"fake,iscsi,direct"} +IRONIC_ENABLED_DEPLOY_INTERFACES=${IRONIC_ENABLED_DEPLOY_INTERFACES:-"fake,iscsi,direct,ramdisk"} IRONIC_ENABLED_INSPECT_INTERFACES=${IRONIC_ENABLED_INSPECT_INTERFACES:-"fake,no-inspect"} IRONIC_ENABLED_MANAGEMENT_INTERFACES=${IRONIC_ENABLED_MANAGEMENT_INTERFACES:-"fake,ipmitool,noop"} IRONIC_ENABLED_NETWORK_INTERFACES=${IRONIC_ENABLED_NETWORK_INTERFACES:-"flat,noop"} @@ -567,6 +567,9 @@ TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-} PHYSICAL_NETWORK=${NEUTRON_PHYSICAL_NETWORK:-${PHYSICAL_NETWORK:-}} +# Ramdisk ISO image for Ramdisk Virtual Media/iPXE testing +IRONIC_RAMDISK_IMAGE=${IRONIC_RAMDISK_IMAGE:-http://tinycorelinux.net/10.x/x86/archive/10.0/Core-10.0.iso} + # get_pxe_boot_file() - Get the PXE/iPXE boot file path function get_pxe_boot_file { local pxe_boot_file @@ -3053,6 +3056,9 @@ function ironic_configure_tempest { fi iniset $TEMPEST_CONFIG baremetal whole_disk_image_checksum $(md5sum $FILES/${IRONIC_WHOLEDISK_IMAGE_NAME}.img) + if [[ "$IRONIC_RAMDISK_IMAGE" != "" ]]; then + iniset $TEMPEST_CONFIG baremetal ramdisk_iso_image_ref "$IRONIC_RAMDISK_IMAGE" + fi # NOTE(dtantsur): keep this option here until the defaults change in # ironic-tempest-plugin to disable classic drivers testing. iniset $TEMPEST_CONFIG baremetal enabled_drivers "" |