diff --git a/common.sh b/common.sh index 844817472..221c2dc9b 100644 --- a/common.sh +++ b/common.sh @@ -191,7 +191,7 @@ if [[ "$OPENSHIFT_VERSION" == "4.3" ]]; then elif [[ -z "$OPENSHIFT_CI" ]]; then export BMC_DRIVER=${BMC_DRIVER:-redfish} else - export BMC_DRIVER=${BMC_DRIVER:-mixed} + export BMC_DRIVER=${BMC_DRIVER:-redfish} fi if [[ "$PROVISIONING_NETWORK_PROFILE" == "Disabled" ]]; then @@ -547,8 +547,7 @@ if [[ "${SCENARIO}" == "SNO" ]]; then fi fi -if [[ "${MIRROR_IMAGES,,}" != "false" ]] && [[ "${MIRROR_IMAGES,,}" == "true" || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" ]]; then - +if [[ "${MIRROR_IMAGES,,}" != "false" ]] && [[ "${MIRROR_IMAGES,,}" == "true" || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" || "$IP_STACK" = "v6v4" ]]; then if [[ "${MIRROR_COMMAND}" == "oc-mirror" ]]; then # Use the string that is generated by the output of oc-mirror export LOCAL_IMAGE_URL_SUFFIX="openshift/release-images" diff --git a/network.sh b/network.sh index 35ebb223f..3291021e1 100755 --- a/network.sh +++ b/network.sh @@ -148,6 +148,11 @@ elif [[ "$IP_STACK" = "v4v6" || "$IP_STACK" = "v6v4" ]]; then export SERVICE_SUBNET_V4=${SERVICE_SUBNET_V4:-"172.30.0.0/16"} export SERVICE_SUBNET_V6=${SERVICE_SUBNET_V6:-"fd02::/112"} export NETWORK_TYPE=${NETWORK_TYPE:-"OVNKubernetes"} + # Although v6-primary clusters have access to both v4 and v6, during provisioning + # the nodes only get v6 addresses so we need to mirror images or they can't pull. + if [[ "$IP_STACK" = "v6v4" ]]; then + export MIRROR_IMAGES=${MIRROR_IMAGES:-true} + fi else echo "Unexpected setting for IP_STACK: '${IP_STACK}'" exit 1