From 3a7d579db292c1349bfa35b6f9c68e555a0160d8 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Fri, 2 Aug 2019 10:21:01 +0000 Subject: [PATCH] Revert "Use config override to update dummy config for FWaaS" This reverts commit 0a256d29420d10ffbb077e3541db85faf4c6e69d. The metadata_access_mark option is not defined when using the vmware_nsx driver because l3 agent options are not registered. Change-Id: Ibfff1c10302924dfefd0f1c144eb4107c499618f --- vmware_nsx/services/fwaas/common/fwaas_callbacks_v2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/vmware_nsx/services/fwaas/common/fwaas_callbacks_v2.py b/vmware_nsx/services/fwaas/common/fwaas_callbacks_v2.py index 58ef631cd6..23ef14c670 100644 --- a/vmware_nsx/services/fwaas/common/fwaas_callbacks_v2.py +++ b/vmware_nsx/services/fwaas/common/fwaas_callbacks_v2.py @@ -169,7 +169,6 @@ class NsxFwaasCallbacksV2(firewall_l3_agent_v2.L3WithFWaaS): def _router_dict_to_obj(self, r): # The callbacks expect a router-info object with an agent config agent_conf = cfg.CONF - agent_conf.set_override('metadata_access_mark', '0x1') agent_conf.metadata_access_mark = '0x1' return router_info.RouterInfo( None, r['id'], router=r,