Merge "NSX|P: disable tier1 firewall before removing the service router"

2019-02-07 06:08:40 +00:00
parent a92b6c88c8 aea0187a5e
commit c3f93300b9
1 changed files with 3 additions and 0 deletions
@@ -1132,6 +1132,9 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
                LOG.warning("Failed to disable standby relocation for router "
                            "%s: %s", router_id, ex)

+        # remove the edge firewall
+        self.nsxpolicy.tier1.update(router_id, disable_firewall=True)
+
        # remove the edge cluster from the tier1 router
        self.nsxpolicy.tier1.remove_edge_cluster(router_id)