From 95865cbf6913289f8efbf787282664efa1d95fe7 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Thu, 20 Jun 2024 14:21:31 +0100
Subject: [PATCH] OCPBUGS-29660: Ignore provisioning ip config if disabled

getProvisioningIPCIDR now returns nil if ProvisioningNetwork is
disabled. The external HostIP will then be used (as intended
when the prov network is disabled).
---
 provisioning/baremetal_config.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/provisioning/baremetal_config.go b/provisioning/baremetal_config.go
index d5366a164..3e70e23d0 100644
--- a/provisioning/baremetal_config.go
+++ b/provisioning/baremetal_config.go
@@ -63,6 +63,9 @@ func getDHCPRange(config *metal3iov1alpha1.ProvisioningSpec) *string {
 }
 
 func getProvisioningIPCIDR(config *metal3iov1alpha1.ProvisioningSpec) *string {
+	if config.ProvisioningNetwork == metal3iov1alpha1.ProvisioningNetworkDisabled {
+		return nil
+	}
 	if config.ProvisioningNetworkCIDR != "" && config.ProvisioningIP != "" {
 		_, net, err := net.ParseCIDR(config.ProvisioningNetworkCIDR)
 		if err == nil {