diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-19 23:04:21 -0400 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-03-24 11:23:25 -0700 |
| commit | 9fb5bbc79a6753c6125e4f3ea007040dad0482ef (patch) | |
| tree | bb95c5d27dfac440884118d2ec4f5ec7a58e63cc /roles/os_firewall/tasks | |
| parent | 85e6948fca954d3c066bf5a6123ada6b96adf45c (diff) | |
| download | openshift-9fb5bbc79a6753c6125e4f3ea007040dad0482ef.tar.gz openshift-9fb5bbc79a6753c6125e4f3ea007040dad0482ef.tar.bz2 openshift-9fb5bbc79a6753c6125e4f3ea007040dad0482ef.tar.xz openshift-9fb5bbc79a6753c6125e4f3ea007040dad0482ef.zip | |
Add verify_chain action to os_firewall_manage_iptables module
- Add verify_chain action to os_firewall_manage_iptables module
- Update os_firewall module to use os_firewall_manage_iptables for creating
the DOCKER chain.
Diffstat (limited to 'roles/os_firewall/tasks')
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml index 3d46d6e2d..72a3401cf 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -41,19 +41,13 @@ changed_when: "'firewalld' in result.stdout" when: pkg_check.rc == 0 -- name: Check for DOCKER chain - shell: iptables -L |grep '^Chain DOCKER' - ignore_errors: yes - register: check_for_chain - -- name: Create DOCKER chain - command: iptables -N DOCKER - register: create_chain - when: check_for_chain.rc != 0 - -- name: Persist DOCKER chain - command: service iptables save - when: create_chain.rc == 0 +# Workaround for Docker 1.4 to create DOCKER chain +- name: Add DOCKER chain + os_firewall_manage_iptables: + name: "DOCKER chain" + action: verify_chain + create_jump_rule: no +# End of Docker 1.4 workaround - name: Add iptables allow rules os_firewall_manage_iptables: |