openstack
/
neutron
Code Issues Proposed changes

Merge "Fix ovs agent, avoiding import error" into stable/train

This commit is contained in:
Zuul 2020-11-17 00:51:33 +00:00 committed by Gerrit Code Review
parent 0e6a429158 dea24403a7
commit 762dcd5cd7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -56,7 +56,6 @@ from neutron.agent.common import polling
from neutron.agent.common import utils from neutron.agent.common import utils
from neutron.agent import firewall as agent_firewall from neutron.agent import firewall as agent_firewall
from neutron.agent.l2 import l2_agent_extensions_manager as ext_manager from neutron.agent.l2 import l2_agent_extensions_manager as ext_manager
from neutron.agent.linux import iptables_firewall
from neutron.agent.linux import xenapi_root_helper from neutron.agent.linux import xenapi_root_helper
from neutron.agent import rpc as agent_rpc from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as agent_sg_rpc from neutron.agent import securitygroups_rpc as agent_sg_rpc
@ -2145,9 +2144,8 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
def direct_for_non_openflow_firewall(self): def direct_for_non_openflow_firewall(self):
return ((isinstance(self.sg_agent.firewall, return ((isinstance(self.sg_agent.firewall,
agent_firewall.NoopFirewallDriver) or agent_firewall.NoopFirewallDriver) or
isinstance( getattr(self.sg_agent.firewall,
self.sg_agent.firewall, 'OVS_HYBRID_PLUG_REQUIRED', False) or
iptables_firewall.OVSHybridIptablesFirewallDriver) or
not agent_sg_rpc.is_firewall_enabled()) and not agent_sg_rpc.is_firewall_enabled()) and
self.conf.AGENT.explicitly_egress_direct) self.conf.AGENT.explicitly_egress_direct)