openstack
/
dragonflow
Code Issues Proposed changes

Remove enable_goto_flows configuration option 

DNAT app no longer creates flows that can be used by SNAT app. Disabling
this option will render SNAT app unusable.

Change-Id: Id7c8051c4c7435d3c006deb07a156541e5ff51bf
This commit is contained in:
Dima Kuznetsov 2017-08-16 20:59:35 +03:00
parent b43544750b
commit f0a6b28429
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dragonflow/conf/df_snat.py
View File

@ -22,7 +22,8 @@ df_snat_app_opts = [
default=True,
help=_("Enable install of common goto flows to ingress/egress "
"NAT tables or re-use goto flows installed by "
"other DF application")),
"other DF application"),
deprecated_for_removal=True),
cfg.StrOpt('external_network_bridge',
default='br-ex',
help=_("Name of bridge used for external network traffic")),

6
dragonflow/controller/apps/chassis_snat.py
View File

@ -46,7 +46,6 @@ class ChassisSNATApp(df_base_app.DFlowApp, snat_mixin.SNATApp_mixin):
# new application configuration
self.external_host_ip = cfg.CONF.df.external_host_ip
self.enable_goto_flows = cfg.CONF.df_snat_app.enable_goto_flows
# create mac address based on given 'external_host_ip'
if self.external_host_ip is not None:
@ -140,9 +139,8 @@ class ChassisSNATApp(df_base_app.DFlowApp, snat_mixin.SNATApp_mixin):
def install_strategy_based_flows(self):
if self.enable_goto_flows is True:
self._install_ingress_goto_rules()
self._install_egress_goto_rules()
self._install_ingress_goto_rules()
self._install_egress_goto_rules()
self._install_snat_ingress_conntrack()