Merge pull request #1225 from shiftstack/bfv_imageref

🐛Don't set ImageRef on server when booting from volume

Author: k8s-ci-robot

pkg/cloud/services/compute/instance.go

@@ -188,20 +188,6 @@ func (s *Service) createInstanceImpl(eventObject runtime.Object, openStackCluste
 		})
 	}
 
-	var serverCreateOpts servers.CreateOptsBuilder = servers.CreateOpts{
-		Name:             instanceSpec.Name,
-		ImageRef:         imageID,
-		FlavorRef:        flavorID,
-		AvailabilityZone: instanceSpec.FailureDomain,
-		Networks:         portList,
-		UserData:         []byte(instanceSpec.UserData),
-		SecurityGroups:   securityGroups,
-		Tags:             instanceSpec.Tags,
-		Metadata:         instanceSpec.Metadata,
-		ConfigDrive:      &instanceSpec.ConfigDrive,
-		AccessIPv4:       accessIPv4,
-	}
-
 	volume, err := s.getOrCreateRootVolume(eventObject, instanceSpec, imageID)
 	if err != nil {
 		return nil, fmt.Errorf("error in get or create root volume: %w", err)
@@ -235,6 +221,26 @@ func (s *Service) createInstanceImpl(eventObject runtime.Object, openStackCluste
 		}
 	}
 
+	// Don't set ImageRef on the server if we're booting from volume
+	var serverImageRef string
+	if volume == nil {
+		serverImageRef = imageID
+	}
+
+	var serverCreateOpts servers.CreateOptsBuilder = servers.CreateOpts{
+		Name:             instanceSpec.Name,
+		ImageRef:         serverImageRef,
+		FlavorRef:        flavorID,
+		AvailabilityZone: instanceSpec.FailureDomain,
+		Networks:         portList,
+		UserData:         []byte(instanceSpec.UserData),
+		SecurityGroups:   securityGroups,
+		Tags:             instanceSpec.Tags,
+		Metadata:         instanceSpec.Metadata,
+		ConfigDrive:      &instanceSpec.ConfigDrive,
+		AccessIPv4:       accessIPv4,
+	}
+
 	serverCreateOpts = applyRootVolume(serverCreateOpts, volume)
 
 	serverCreateOpts = applyServerGroupID(serverCreateOpts, instanceSpec.ServerGroupID)

pkg/cloud/services/compute/instance_test.go

@@ -834,6 +834,7 @@ func TestService_ReconcileInstance(t *testing.T) {
 
 				createMap := getDefaultServerMap()
 				serverMap := createMap["server"].(map[string]interface{})
+				serverMap["imageRef"] = ""
 				serverMap["block_device_mapping_v2"] = []map[string]interface{}{
 					{
 						"delete_on_termination": true,
@@ -880,6 +881,7 @@ func TestService_ReconcileInstance(t *testing.T) {
 
 				createMap := getDefaultServerMap()
 				serverMap := createMap["server"].(map[string]interface{})
+				serverMap["imageRef"] = ""
 				serverMap["block_device_mapping_v2"] = []map[string]interface{}{
 					{
 						"delete_on_termination": true,