summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-25 15:08:59 -0500
committerGitHub <noreply@github.com>2017-01-25 15:08:59 -0500
commit7f1f05d90b4f6032629cf1a08e8f4139093f0f0b (patch)
tree2e9ed30f4540298ff614bd1d48239c3369ca57e4 /roles
parent23524879781958ebdc69f4c68d2429db5544f8ee (diff)
parent47ecfb8fb5739161b6904e014567f65757be519b (diff)
downloadopenshift-7f1f05d90b4f6032629cf1a08e8f4139093f0f0b.tar.gz
openshift-7f1f05d90b4f6032629cf1a08e8f4139093f0f0b.tar.bz2
openshift-7f1f05d90b4f6032629cf1a08e8f4139093f0f0b.tar.xz
openshift-7f1f05d90b4f6032629cf1a08e8f4139093f0f0b.zip
Merge pull request #3181 from sdodson/10seconds-ought-to-be-enough
Add 10 second wait after disabling firewalld/iptables
Diffstat (limited to 'roles')
-rw-r--r--roles/os_firewall/tasks/firewall/firewalld.yml5
-rw-r--r--roles/os_firewall/tasks/firewall/iptables.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml
index c4db197ca..a9a69f73c 100644
--- a/roles/os_firewall/tasks/firewall/firewalld.yml
+++ b/roles/os_firewall/tasks/firewall/firewalld.yml
@@ -16,6 +16,11 @@
register: task_result
failed_when: "task_result|failed and 'could not' not in task_result.msg|lower"
+- name: Wait 10 seconds after disabling iptables
+ pause:
+ seconds: 10
+ when: task_result | changed
+
- name: Start and enable firewalld service
systemd:
name: firewalld
diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml
index 930b32cf2..38ea2477c 100644
--- a/roles/os_firewall/tasks/firewall/iptables.yml
+++ b/roles/os_firewall/tasks/firewall/iptables.yml
@@ -9,6 +9,11 @@
register: task_result
failed_when: "task_result|failed and 'could not' not in task_result.msg|lower"
+- name: Wait 10 seconds after disabling firewalld
+ pause:
+ seconds: 10
+ when: task_result | changed
+
- name: Install iptables packages
package: name={{ item }} state=present
with_items: