diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-04-22 09:34:45 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-04-22 09:34:45 -0700 |
| commit | b3c9e90b10dd5708454628ea037708cfd8374599 (patch) | |
| tree | a250edda88d326b2c31806da14926f0f95bf8aa2 /roles/os_firewall/tasks | |
| parent | fb72f9253b53ad858f5d8e47d7904c532edcfa48 (diff) | |
| parent | 8acca7f942b1d3328d7eb6cdbfe45b19217cde38 (diff) | |
| download | openshift-b3c9e90b10dd5708454628ea037708cfd8374599.tar.gz openshift-b3c9e90b10dd5708454628ea037708cfd8374599.tar.bz2 openshift-b3c9e90b10dd5708454628ea037708cfd8374599.tar.xz openshift-b3c9e90b10dd5708454628ea037708cfd8374599.zip | |
Merge pull request #169 from detiber/gce_iptables_defaults
fixes to better deal with gce image defaults
Diffstat (limited to 'roles/os_firewall/tasks')
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 1 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml index b6bddd5c5..5089eb3e0 100644 --- a/roles/os_firewall/tasks/firewall/firewalld.yml +++ b/roles/os_firewall/tasks/firewall/firewalld.yml @@ -44,6 +44,7 @@ - iptables - ip6tables when: pkg_check.rc == 0 + ignore_errors: yes # TODO: Ansible 1.9 will eliminate the need for separate firewalld tasks for # enabling rules and making them permanent with the immediate flag diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml index 7b5c00a9b..9af9d8d29 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -42,6 +42,7 @@ register: result changed_when: "'firewalld' in result.stdout" when: pkg_check.rc == 0 + ignore_errors: yes - name: Add iptables allow rules os_firewall_manage_iptables: |