openstack
/
neutron
Code Issues Proposed changes

Merge "Fix metering-agent iptables restore failure"

This commit is contained in:
Jenkins 2016-09-16 04:28:18 +00:00 committed by Gerrit Code Review
parent 931c59f428 35e386f616
commit ba9b140e27
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/linux/iptables_manager.py
View File

@ -765,6 +765,11 @@ def _generate_chain_diff_iptables_commands(chain, old_chain_rules,
elif line.startswith('+'): # line added
# strip the chain name since we have to add it before the index
rule = line[5:].split(' ', 1)[-1]
# IptablesRule does not add trailing spaces for rules, so we
# have to detect that here by making sure this chain isn't
# referencing itself
if rule == chain:
rule = ''
# rule inserted at this position
statements.append('-I %s %d %s' % (chain, old_index, rule))
old_index += 1