From e7d3a21d809d0f56dfbc628e85f0650822710896 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Thu, 29 Aug 2024 14:40:40 -0500
Subject: [PATCH 1/2] Fix mirror config for v6-primary

It turns out we do need to mirror images for v6-primary clusters
because during provisioning they only get an IP from the primary
family, which means they can't pull images from the public ipv4
image registries. This fixes the logic so it is all consistent
where it needs to be so v6-primary deployments will work as intended
by default.
---
 common.sh  | 3 +--
 network.sh | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common.sh b/common.sh
index 8c1c4fb82..de9b24c0e 100644
--- a/common.sh
+++ b/common.sh
@@ -515,8 +515,7 @@ if [[ ! -z ${AGENT_E2E_TEST_BOOT_MODE} ]]; then
   esac
 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

From ffa241bfb0985224a778764c7e2981fa5a91257f Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 14 Apr 2025 14:44:47 -0500
Subject: [PATCH 2/2] DNM: Temporarily force redfish BMC driver

---
 common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.sh b/common.sh
index de9b24c0e..de4ba295f 100644
--- a/common.sh
+++ b/common.sh
@@ -188,7 +188,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