builder/openstack: proper error extraction

builder/openstack-new/server.go

@@ -36,20 +36,15 @@ type StateChangeConf struct {
 func ServerStateRefreshFunc(
 	client *gophercloud.ServiceClient, s *servers.Server) StateRefreshFunc {
 	return func() (interface{}, string, int, error) {
-		var serverNew *servers.Server
-		result := servers.Get(client, s.ID)
-		err := result.Err
-		if err == nil {
-			serverNew, err = result.Extract()
-		}
-		if result.Err != nil {
-			errCode, ok := result.Err.(*gophercloud.UnexpectedResponseCodeError)
+		serverNew, err := servers.Get(client, s.ID).Extract()
+		if err != nil {
+			errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError)
 			if ok && errCode.Actual == 404 {
 				log.Printf("[INFO] 404 on ServerStateRefresh, returning DELETED")
 				return nil, "DELETED", 0, nil
 			} else {
-				log.Printf("[ERROR] Error on ServerStateRefresh: %s", result.Err)
-				return nil, "", 0, result.Err
+				log.Printf("[ERROR] Error on ServerStateRefresh: %s", err)
+				return nil, "", 0, err
 			}
 		}
 

builder/openstack-new/step_create_image.go

@@ -62,13 +62,15 @@ func (s *stepCreateImage) Cleanup(multistep.StateBag) {
 // WaitForImage waits for the given Image ID to become ready.
 func WaitForImage(client *gophercloud.ServiceClient, imageId string) error {
 	for {
-		var image *images.Image
-		result := images.Get(client, imageId)
-		err := result.Err
-		if err == nil {
-			image, err = result.Extract()
-		}
+		image, err := images.Get(client, imageId).Extract()
 		if err != nil {
+			errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError)
+			if ok && errCode.Actual == 500 {
+				log.Printf("[ERROR] 500 error received, will ignore and retry: %s", err)
+				time.Sleep(2 * time.Second)
+				continue
+			}
+
 			return err
 		}