Merge pull request #891 from Nordix/fix-instance-creation-nil-log

Fix error logging for OpenStack instance creation
kubernetes-sigs · Jun 3, 2021 · edea569 · edea569
2 parents 04e0b54 + d798638
commit edea569
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go
@@ -228,10 +228,11 @@ func (s *Service) createInstance(eventObject runtime.Object, clusterName string,
 	}).Extract()
 
 	if mc.ObserveRequest(err) != nil {
+		serverErr := err
 		if err = s.deletePorts(eventObject, portList); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error creating OpenStack instance: %v, error deleting ports: %v", serverErr, err)
 		}
-		return nil, fmt.Errorf("error creating Openstack instance: %v", err)
+		return nil, fmt.Errorf("error creating Openstack instance: %v", serverErr)
 	}
 	instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", TimeoutInstanceCreate)
 	instanceCreateTimeout *= time.Minute