diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-11 11:00:40 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-11 11:00:40 -0500 |
| commit | 0bbfef4e1951db1f19135e532f78fe12cab6d4fc (patch) | |
| tree | c01a390c68d29bd8b6b7a29db794b594bfa11216 /roles/os_firewall/tasks | |
| parent | c607f1ba93be5e9f16723074ff97ffd27b025f8c (diff) | |
| parent | 2dc56faff5812ba436bffd2fcd3ec2ac57780286 (diff) | |
Merge pull request #1155 from mwoodson/host_monitoring
merging master into prod
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 ba12c6b0c..ac4600f83 100644 --- a/roles/os_firewall/tasks/firewall/firewalld.yml +++ b/roles/os_firewall/tasks/firewall/firewalld.yml @@ -1,6 +1,7 @@ --- - name: Install firewalld packages action: "{{ ansible_pkg_mgr }} name=firewalld state=present" + when: not openshift.common.is_containerized | bool register: install_result - name: Check if iptables-services is installed diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml index d3a5b1fa7..5cf4bf7af 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -5,6 +5,7 @@ - iptables - iptables-services register: install_result + when: not openshift.common.is_atomic | bool - name: Check if firewalld is installed command: rpm -q firewalld |