openstack/ironic
Code Issues Proposed changes

Merge "Test redfish with reduced sushy-tools feature set"

Browse Source
This commit is contained in:
Zuul 2023-12-20 18:12:59 +00:00 committed by Gerrit Code Review
commit cf7b182ac3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/ironic
View File

@ -435,6 +435,7 @@ IRONIC_VPDU_SYSTEMD_SERVICE=devstack@virtualpdu.service
IRONIC_REDFISH_EMULATOR_PORT=${IRONIC_REDFISH_EMULATOR_PORT:-9132}
IRONIC_REDFISH_EMULATOR_SYSTEMD_SERVICE="devstack@redfish-emulator.service"
IRONIC_REDFISH_EMULATOR_CONFIG=${IRONIC_REDFISH_EMULATOR_CONFIG:-$IRONIC_CONF_DIR/redfish/emulator.conf}
IRONIC_REDFISH_EMULATOR_FEATURE_SET=${IRONIC_REDFISH_EMULATOR_FEATURE_SET:-full}
# To explicitly enable configuration of Glance with Swift
# (which is required by some vendor drivers), set this
@ -1063,7 +1064,8 @@ function install_redfish {
git_clone_by_name "sushy-tools"
setup_dev_lib "sushy-tools"
else
pip_install "sushy-tools"
# 1.1.0 adds support for feature sets
pip_install "sushy-tools>=1.1.0"
fi
local cmd
@ -1098,6 +1100,7 @@ SUSHY_EMULATOR_BOOT_LOADER_MAP = {
'x86_64': None
}
}
SUSHY_EMULATOR_FEATURE_SET = "$IRONIC_REDFISH_EMULATOR_FEATURE_SET"
EOF
}

3
zuul.d/ironic-jobs.yaml
View File

@ -276,6 +276,8 @@
# Reset the callback to a normal-ish value.
IRONIC_CALLBACK_TIMEOUT: 600
IRONIC_BOOT_MODE: bios
# Make sure this feature works even with the minumum implementation
IRONIC_REDFISH_EMULATOR_FEATURE_SET: minimum
devstack_services:
# Parent job uses swift, this one does not, thus we can turn it off.
s-account: False
@ -304,6 +306,7 @@
IRONIC_GRUB2_SHIM_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/BOOTX64.EFI
IRONIC_GRUB2_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/grubx64.efi
IRONIC_GRUB2_CONFIG_PATH: EFI/BOOT/grub.cfg
IRONIC_REDFISH_EMULATOR_FEATURE_SET: vmedia
devstack_services:
s-account: True
s-container: True