From 4831350452cde2d676144f78fa23dd9628a288e2 Mon Sep 17 00:00:00 2001
From: Adit Sarfaty <asarfaty@vmware.com>
Date: Mon, 24 Dec 2018 14:00:47 +0200
Subject: [PATCH] NSX|P: Remove tier1 router service in cleanup

Change-Id: I23d3919d56d6cdb7a5693e14e2db2fdafd1d92bb
---
 devstack/tools/nsxp_cleanup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/devstack/tools/nsxp_cleanup.py b/devstack/tools/nsxp_cleanup.py
index 67b977f8b4..bed62f78b4 100755
--- a/devstack/tools/nsxp_cleanup.py
+++ b/devstack/tools/nsxp_cleanup.py
@@ -154,6 +154,11 @@ class NSXClient(object):
         for rtr in routers:
             # remove all nat rules from this router before deletion
             self.cleanup_tier1_nat_rules(rtr['id'])
+            try:
+                self.nsxpolicy.tier1.remove_edge_cluster(rtr['id'])
+            except exceptions.ManagerError as e:
+                # Not always exists
+                pass
             try:
                 self.nsxpolicy.tier1.delete(rtr['id'])
             except exceptions.ManagerError as e: