openstack
/
neutron
Code Issues Proposed changes

Merge "Trivial: check if ipv6 is available for IptablesManager" into stable/ussuri

This commit is contained in:
Zuul 2021-08-23 21:36:06 +00:00 committed by Gerrit Code Review
parent ce87f7703e b6a6065f9f
commit 8e581d31cd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/linux/dhcp.py
View File

@ -1799,8 +1799,8 @@ class DeviceManager(object):
def fill_dhcp_udp_checksums(self, namespace): def fill_dhcp_udp_checksums(self, namespace):
"""Ensure DHCP reply packets always have correct UDP checksums.""" """Ensure DHCP reply packets always have correct UDP checksums."""
iptables_mgr = iptables_manager.IptablesManager(use_ipv6=True, iptables_mgr = iptables_manager.IptablesManager(
nat=False, use_ipv6=netutils.is_ipv6_enabled(), nat=False,
namespace=namespace) namespace=namespace)
ipv4_rule = ('-p udp -m udp --dport %d -j CHECKSUM --checksum-fill' ipv4_rule = ('-p udp -m udp --dport %d -j CHECKSUM --checksum-fill'
% constants.DHCP_RESPONSE_PORT) % constants.DHCP_RESPONSE_PORT)

4
neutron/agent/ovn/metadata/agent.py
View File

@ -18,6 +18,7 @@ import re
from neutron_lib import constants as n_const from neutron_lib import constants as n_const
from oslo_concurrency import lockutils from oslo_concurrency import lockutils
from oslo_log import log from oslo_log import log
from oslo_utils import netutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
from ovsdbapp.backend.ovs_idl import event as row_event from ovsdbapp.backend.ovs_idl import event as row_event
from ovsdbapp.backend.ovs_idl import vlog from ovsdbapp.backend.ovs_idl import vlog
@ -372,7 +373,8 @@ class MetadataAgent(object):
return return
iptables_mgr = iptables_manager.IptablesManager( iptables_mgr = iptables_manager.IptablesManager(
use_ipv6=True, nat=False, namespace=namespace, external_lock=False) use_ipv6=netutils.is_ipv6_enabled(), nat=False,
namespace=namespace, external_lock=False)
rule = '-p tcp -m tcp -j CHECKSUM --checksum-fill' rule = '-p tcp -m tcp -j CHECKSUM --checksum-fill'
iptables_mgr.ipv4['mangle'].add_rule('POSTROUTING', rule, wrap=False) iptables_mgr.ipv4['mangle'].add_rule('POSTROUTING', rule, wrap=False)
iptables_mgr.apply() iptables_mgr.apply()