From c33fd0d54881735b98aa38849e668fe4f60ce9a8 Mon Sep 17 00:00:00 2001 From: Daehyeok Mun Date: Wed, 6 Jan 2016 18:04:50 -0700 Subject: [PATCH] GCE delete instance during rm Delete instance during rm command regardless instance status Signed-off-by: Daehyeok Mun --- drivers/google/google.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/google/google.go b/drivers/google/google.go index ddaf59eb06..4bf007c20f 100644 --- a/drivers/google/google.go +++ b/drivers/google/google.go @@ -360,14 +360,9 @@ func (d *Driver) Remove() error { return err } - s, err := d.GetState() - if err != nil { + if err := c.deleteInstance(); err != nil { return err } - if s == state.Running { - if err := c.deleteInstance(); err != nil { - return err - } - } + return c.deleteDisk() }