Remove volume by cleanup

Author: zhenggu

builder/openstack/step_create_volume.go

@@ -79,18 +79,14 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	// Wait for volume to become available.
 	ui.Say(fmt.Sprintf("Waiting for volume %s (volume id: %s) to become available...", config.VolumeName, volume.ID))
 	if err := WaitForVolume(blockStorageClient, volume.ID); err != nil {
-		_, ok := err.(*volumeErr)
 		err := fmt.Errorf("Error waiting for volume: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())
-		if ok {
-			ui.Say(fmt.Sprintf("Deleting volume: %s ...", volume.ID))
-			err = volumes.Delete(blockStorageClient, volume.ID, volumes.DeleteOpts{}).ExtractErr()
-			if err != nil {
-				ui.Error(fmt.Sprintf(
-					"Error cleaning up volume. Please delete the volume manually: %s", volume.ID))
-			}
-		}
+
+		// The volume ID has created, try to clean up
+		s.doCleanup = true
+		s.volumeID = volume.ID
+
 		return multistep.ActionHalt
 	}
 

builder/openstack/volume.go

@@ -4,6 +4,7 @@
 package openstack
 
 import (
+	"errors"
 	"log"
 	"time"
 
@@ -12,12 +13,6 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
 )
 
-type volumeErr struct{}
-
-func (err *volumeErr) Error() string {
-	return "The status of volume is error"
-}
-
 // WaitForVolume waits for the given volume to become available.
 func WaitForVolume(blockStorageClient *gophercloud.ServiceClient, volumeID string) error {
 	maxNumErrors := 10
@@ -46,7 +41,7 @@ func WaitForVolume(blockStorageClient *gophercloud.ServiceClient, volumeID strin
 		}
 
 		if status == "error" {
-			return &volumeErr{}
+			return errors.New("The status of volume is error")
 		}
 
 		log.Printf("Waiting for volume creation status: %s", status)