Skip to content

Allow limiting virtual media emulator to one IP family #1783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions 02_configure_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ if ! [[ -f /usr/share/OVMF/OVMF_CODE.fd || -L /usr/share/OVMF/OVMF_CODE.fd ]]; t
sudo ln -s /usr/share/edk2/ovmf/OVMF_CODE.fd /usr/share/OVMF/
fi

# TODO(dtantsur): move this to metal3-dev-env
if [ ${IP_STACK} = "v6v4" ]; then
# Make sure that BMC's use IPv6 on v6-primary stack
sed -i "/address/s|//[0-9.]*:|//[${PROVISIONING_HOST_EXTERNAL_IP}]:|" "${NODES_FILE}"
fi

if [ ${NUM_EXTRA_WORKERS} -ne 0 ]; then
ORIG_NODES_FILE="${NODES_FILE}.orig"
cp -f ${NODES_FILE} ${ORIG_NODES_FILE}
Expand Down
4 changes: 4 additions & 0 deletions 04_setup_ironic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ if [ "$NODES_PLATFORM" = "libvirt" ]; then
"${VBMC_IMAGE}"
fi

if [[ -n "${REDFISH_EMULATOR_VIRTUAL_MEDIA_IP_FAMILY:-}" ]]; then
echo "SUSHY_EMULATOR_VIRTUAL_MEDIA_IP_FAMILY = '${REDFISH_EMULATOR_VIRTUAL_MEDIA_IP_FAMILY}'" | sudo tee -a "$WORKING_DIR/virtualbmc/sushy-tools/conf.py"
fi

if ! is_running sushy-tools; then
sudo podman run -d --net host --privileged --name sushy-tools --pod ironic-pod \
-v "$WORKING_DIR/virtualbmc/sushy-tools":/root/sushy -v "/root/.ssh":/root/ssh \
Expand Down
6 changes: 6 additions & 0 deletions config_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,12 @@ set -x
#
#export REDFISH_EMULATOR_IGNORE_BOOT_DEVICE=False

# REDFISH_EMULATOR_VIRTUAL_MEDIA_IP_FAMILY
# Instruct the Redfish emulator to accept only virtual media images of the
# provided IP familty.
# Choices: 4, 6
#export REDFISH_EMULATOR_VIRTUAL_MEDIA_IP_FAMILY=

# VM_TPM_EMULATOR -
# Add TPM2.0 emulator to VMs.
# Default is unset
Expand Down