Merge "NSX|P: Disable API passthrough for enable_standby_relocation"
This commit is contained in:
commit
c29c51d2fb
|
@ -1384,7 +1384,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
|
||||||
LOG.error("Tier0 %s does not have an edge cluster",
|
LOG.error("Tier0 %s does not have an edge cluster",
|
||||||
tier0_uuid)
|
tier0_uuid)
|
||||||
|
|
||||||
if cfg.CONF.nsx_p.allow_passthrough:
|
|
||||||
try:
|
try:
|
||||||
# Enable standby relocation on this router
|
# Enable standby relocation on this router
|
||||||
self.nsxpolicy.tier1.set_standby_relocation(
|
self.nsxpolicy.tier1.set_standby_relocation(
|
||||||
|
@ -1399,7 +1398,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
|
||||||
self.update_router_firewall(context, router_id)
|
self.update_router_firewall(context, router_id)
|
||||||
|
|
||||||
def delete_service_router(self, project_id, router_id):
|
def delete_service_router(self, project_id, router_id):
|
||||||
if cfg.CONF.nsx_p.allow_passthrough:
|
|
||||||
try:
|
try:
|
||||||
# Disable standby relocation on this router
|
# Disable standby relocation on this router
|
||||||
self.nsxpolicy.tier1.set_standby_relocation(
|
self.nsxpolicy.tier1.set_standby_relocation(
|
||||||
|
|
Loading…
Reference in New Issue