builder/digitalocean: retry longer and don't retry shutdown

builder/digitalocean/step_create_droplet.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"time"
 )
 
 type stepCreateDroplet struct {
@@ -55,16 +54,7 @@ func (s *stepCreateDroplet) Cleanup(state multistep.StateBag) {
 	// Destroy the droplet we just created
 	ui.Say("Destroying droplet...")
 
-	var err error
-	for i := 0; i < 5; i++ {
-		err = client.DestroyDroplet(s.dropletId)
-		if err == nil {
-			break
-		}
-
-		time.Sleep(2 * time.Second)
-	}
-
+	err := client.DestroyDroplet(s.dropletId)
 	if err != nil {
 		curlstr := fmt.Sprintf("curl '%v/droplets/%v/destroy?client_id=%v&api_key=%v'",
 			DIGITALOCEAN_API_URL, s.dropletId, c.ClientID, c.APIKey)

builder/digitalocean/step_shutdown.go

@@ -61,7 +61,7 @@ func (s *stepShutdown) Run(state multistep.StateBag) multistep.StepAction {
 		}
 	}()
 
-	err = waitForDropletState("off", dropletId, client, 2 * time.Minute)
+	err = waitForDropletState("off", dropletId, client, 2*time.Minute)
 	if err != nil {
 		log.Printf("Error waiting for graceful off: %s", err)
 	}