Merge pull request #152 from rabi/preprov

Don't override preprovisioningNetworkDataName
openstack-k8s-operators · Mar 18, 2024 · 4df2088 · 4df2088
2 parents e5f6ab9 + 06947f2
commit 4df2088
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/openstackbaremetalset/baremetalhost.go b/pkg/openstackbaremetalset/baremetalhost.go
@@ -206,7 +206,10 @@ func BaremetalHostProvision(
 		foundBaremetalHost.Spec.AutomatedCleaningMode = metal3v1.AutomatedCleaningMode(instance.Spec.AutomatedCleaningMode)
 
 		// Ensure PreprovisioningNetworkDataName is set as per spec
-		foundBaremetalHost.Spec.PreprovisioningNetworkDataName = instance.Spec.BaremetalHosts[hostName].PreprovisioningNetworkDataName
+		preprovNetworkData := instance.Spec.BaremetalHosts[hostName].PreprovisioningNetworkDataName
+		if preprovNetworkData != "" {
+			foundBaremetalHost.Spec.PreprovisioningNetworkDataName = preprovNetworkData
+		}
 
 		//
 		// Ensure the image url is up to date unless already provisioned