Stop using a specific mirror in infra
The host currently hard-coded is not functioning. This replaces the hard-coded mirror by the local CI mirror detected. In case mirror info is not available then upstream centos mirror is used. Change-Id: I96a8cb45154c9dbb50efecc22d34c4ff75c6722a (cherry picked from commit7032a0d9ac
) (cherry picked from commitaec3c072cd
)
This commit is contained in:
parent
99f03fb4b0
commit
e04a7273a9
@ -679,6 +679,14 @@ if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
|
|||||||
die $LINENO "Grub2 Bootloader and Shim file missing."
|
die $LINENO "Grub2 Bootloader and Shim file missing."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# NOTE(tkajinam) Use local mirror in CI
|
||||||
|
if [ -f /etc/ci/mirror_info.sh ]; then
|
||||||
|
source /etc/ci/mirror_info.sh
|
||||||
|
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"
|
||||||
|
IRONIC_GRUB2_SHIM_FILE=$(echo $IRONIC_GRUB2_SHIM_FILE | sed "s|https://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g")
|
||||||
|
IRONIC_GRUB2_FILE=$(echo $IRONIC_GRUB2_FILE | sed "s|https://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g")
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO(pas-ha) find a way to (cross-)sign the custom CA bundle used by tls-proxy
|
# TODO(pas-ha) find a way to (cross-)sign the custom CA bundle used by tls-proxy
|
||||||
|
@ -299,8 +299,8 @@
|
|||||||
# result and makes this job VERY sensitive to heavy disk IO of the
|
# result and makes this job VERY sensitive to heavy disk IO of the
|
||||||
# underlying hypervisor/cloud.
|
# underlying hypervisor/cloud.
|
||||||
IRONIC_CALLBACK_TIMEOUT: 800
|
IRONIC_CALLBACK_TIMEOUT: 800
|
||||||
IRONIC_GRUB2_SHIM_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/BOOTX64.EFI
|
IRONIC_GRUB2_SHIM_FILE: https://mirror.stream.centos.org/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_FILE: https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/EFI/BOOT/grubx64.efi
|
||||||
IRONIC_GRUB2_CONFIG_PATH: EFI/BOOT/grub.cfg
|
IRONIC_GRUB2_CONFIG_PATH: EFI/BOOT/grub.cfg
|
||||||
devstack_services:
|
devstack_services:
|
||||||
s-account: True
|
s-account: True
|
||||||
|
Loading…
Reference in New Issue
Block a user