Merge pull request #920 from hardys/router_destroy_revert

Revert "OpenStack Destroy, tolerate temporary router delete failure"
openshift · Dec 15, 2018 · 0f9cbdf · 0f9cbdf
2 parents 67b8bbb + c74de37
commit 0f9cbdf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/destroy/openstack/openstack_deprovision.go b/pkg/destroy/openstack/openstack_deprovision.go
@@ -335,8 +335,8 @@ func deleteRouters(opts *clientconfig.ClientOpts, filter Filter, logger logrus.F
 		logger.Debugf("Deleting Router: %+v\n", router.ID)
 		err = routers.Delete(conn, router.ID).ExtractErr()
 		if err != nil {
-			// This can fail when port is still in use
-			return false, nil
+			logger.Fatalf("%v", err)
+			os.Exit(1)
 		}
 	}
 	return len(allRouters) == 0, nil