iptables-restore wait period cannot be zero
In case --wait (-w) parameter is zero, iptables-restore returns an
error.
Correct:
[root@dev02 iptables]# iptables-restore -w 1 -W 20000 ipt
Incorrect:
[root@dev02 iptables]# iptables-restore -w 0 -W 20000 ipt
Option --wait-interval requires option --wait
Change-Id: I431fe6f637b963d61d81afed30a4fb1ec112d66c
Closes-Bug: #1800884
(cherry picked from commit 84a9a5ec57
)
This commit is contained in:
parent
af84349a4c
commit
4bfed2b169
|
@ -478,7 +478,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[:]
|
||||
|
|
Loading…
Reference in New Issue