From 7e568644a5419079be424a6198e6688aa4e1a08e Mon Sep 17 00:00:00 2001 From: Viktor Benei Date: Sat, 14 Nov 2015 12:11:44 +0100 Subject: [PATCH] increased DigitalOcean unlock wait timeouts --- builder/digitalocean/step_power_off.go | 2 +- builder/digitalocean/step_shutdown.go | 2 +- builder/digitalocean/step_snapshot.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/digitalocean/step_power_off.go b/builder/digitalocean/step_power_off.go index 8341083aa..d58189d6e 100644 --- a/builder/digitalocean/step_power_off.go +++ b/builder/digitalocean/step_power_off.go @@ -50,7 +50,7 @@ func (s *stepPowerOff) Run(state multistep.StateBag) multistep.StepAction { } // Wait for the droplet to become unlocked for future steps - if err := waitForDropletUnlocked(client, dropletId, 2*time.Minute); err != nil { + if err := waitForDropletUnlocked(client, dropletId, 4*time.Minute); err != nil { // If we get an error the first time, actually report it err := fmt.Errorf("Error powering off droplet: %s", err) state.Put("error", err) diff --git a/builder/digitalocean/step_shutdown.go b/builder/digitalocean/step_shutdown.go index da04aee33..b6f702ce7 100644 --- a/builder/digitalocean/step_shutdown.go +++ b/builder/digitalocean/step_shutdown.go @@ -72,7 +72,7 @@ func (s *stepShutdown) Run(state multistep.StateBag) multistep.StepAction { return multistep.ActionHalt } - if err := waitForDropletUnlocked(client, dropletId, 2*time.Minute); err != nil { + if err := waitForDropletUnlocked(client, dropletId, 4*time.Minute); err != nil { // If we get an error the first time, actually report it err := fmt.Errorf("Error shutting down droplet: %s", err) state.Put("error", err) diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go index fdc303105..ccdc23d0c 100644 --- a/builder/digitalocean/step_snapshot.go +++ b/builder/digitalocean/step_snapshot.go @@ -30,8 +30,8 @@ func (s *stepSnapshot) Run(state multistep.StateBag) multistep.StepAction { // Wait for the droplet to become unlocked first. For snapshots // this can end up taking quite a long time, so we hardcode this to - // 10 minutes. - if err := waitForDropletUnlocked(client, dropletId, 10*time.Minute); err != nil { + // 15 minutes. + if err := waitForDropletUnlocked(client, dropletId, 15*time.Minute); err != nil { // If we get an error the first time, actually report it err := fmt.Errorf("Error shutting down droplet: %s", err) state.Put("error", err)