]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commit
Add --wait to iptables commands 64/25864/3 1.8.0-mos 1.8.0-mos-rc1
authorAlex Schultz <aschultz@mirantis.com>
Mon, 15 Aug 2016 17:01:50 +0000 (11:01 -0600)
committerMaksim Malchuk <mmalchuk@mirantis.com>
Tue, 6 Sep 2016 11:29:19 +0000 (14:29 +0300)
commit504d718158325a8167b6d64092e520bf5db211ef
tree8b9ab7be46c7e05ff9533a76adb020cf666bb93e
parent8655623f0a71c0ea43fa9153936b85ad092ae976
Add --wait to iptables commands

This change adds the --wait flag to the insert/update/delete iptables
actions to prevent failures from occuring when iptables is running
outside of puppet. Previously if a script or a user is running iptables
commands while puppet is running, there may be failures in the firewall
provider if iptables cannot get a lock. By default, iptables will just
fail with an error so using --wait will make it wait until a lock can be
established. The --wait is only added for iptables >= 1.4.20.

Closes-Bug: #1612185
Change-Id: I4f667f61ef986f60441dbac3b440e383cc131451
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
lib/puppet/provider/firewall/iptables.rb
spec/fixtures/ip6tables/conversion_hash.rb