diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
| commit | 7f7b582a7bc239e69c147b98c8c2512050f12851 (patch) | |
| tree | f0701e3ce7a42761e9dfb59218057a46e48a901b /roles/os_firewall/tasks | |
| parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
| parent | 0722304b2f9c94a2f70054e0a3c7feceaedb195c (diff) | |
| download | openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.gz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.bz2 openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.xz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.zip | |
Merge pull request #158 from openshift/master
Merge master into INT for first v3 INT deploy
Diffstat (limited to 'roles/os_firewall/tasks')
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 5 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml index 469cfab6f..b6bddd5c5 100644 --- a/roles/os_firewall/tasks/firewall/firewalld.yml +++ b/roles/os_firewall/tasks/firewall/firewalld.yml @@ -3,6 +3,7 @@ yum: name: firewalld state: present + register: install_result - name: Check if iptables-services is installed command: rpm -q iptables-services @@ -20,6 +21,10 @@ - ip6tables when: pkg_check.rc == 0 +- name: Reload systemd units + command: systemctl daemon-reload + when: install_result | changed + - name: Start and enable firewalld service service: name: firewalld diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml index 87e77c083..7b5c00a9b 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -6,6 +6,7 @@ with_items: - iptables - iptables-services + register: install_result - name: Check if firewalld is installed command: rpm -q firewalld @@ -20,14 +21,15 @@ enabled: no when: pkg_check.rc == 0 -- name: Start and enable iptables services +- name: Reload systemd units + command: systemctl daemon-reload + when: install_result | changed + +- name: Start and enable iptables service service: - name: "{{ item }}" + name: iptables state: started enabled: yes - with_items: - - iptables - - ip6tables register: result - name: need to pause here, otherwise the iptables service starting can sometimes cause ssh to fail |