Revert "Use config override to update dummy config for FWaaS"

This reverts commit 0a256d2942.

The metadata_access_mark option is not defined when using the vmware_nsx driver because l3 agent options are not registered.

Change-Id: Ibfff1c10302924dfefd0f1c144eb4107c499618f
This commit is contained in:
Salvatore Orlando 2019-08-02 10:21:01 +00:00 committed by Adit Sarfaty
parent 91460b60ad
commit 3a7d579db2

View File

@ -169,7 +169,6 @@ class NsxFwaasCallbacksV2(firewall_l3_agent_v2.L3WithFWaaS):
def _router_dict_to_obj(self, r): def _router_dict_to_obj(self, r):
# The callbacks expect a router-info object with an agent config # The callbacks expect a router-info object with an agent config
agent_conf = cfg.CONF agent_conf = cfg.CONF
agent_conf.set_override('metadata_access_mark', '0x1')
agent_conf.metadata_access_mark = '0x1' agent_conf.metadata_access_mark = '0x1'
return router_info.RouterInfo( return router_info.RouterInfo(
None, r['id'], router=r, None, r['id'], router=r,