Merge pull request openshift#911 from hardys/issues/891

OpenStack Destroy, tolerate temporary router delete failure
wking · Dec 14, 2018 · 14505f3 · 14505f3
2 parents 3b9d99b + fb73b45
commit 14505f3
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 {
-			logger.Fatalf("%v", err)
-			os.Exit(1)
+			// This can fail when port is still in use
+			return false, nil
 		}
 	}
 	return len(allRouters) == 0, nil