openstack
/
neutron
Code Issues Proposed changes

Merge "iptables-restore wait period cannot be zero"

This commit is contained in:
Zuul 2018-11-02 01:05:20 +00:00 committed by Gerrit Code Review
parent 2005700de4 84a9a5ec57
commit 5ad2bfdbfe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,7 +475,7 @@ class IptablesManager(object):
@property
def xlock_wait_time(self):
# give agent some time to report back to server
return str(int(cfg.CONF.AGENT.report_interval / 3.0))
return str(max(int(cfg.CONF.AGENT.report_interval / 3.0), 1))
def _do_run_restore(self, args, commands, lock=False):
args = args[:]