diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-19 18:46:48 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-19 18:46:48 -0500 |
| commit | c473a90f4abe887a1a94819e2feac8dcd29dc839 (patch) | |
| tree | 9c736326cf4b76e119174d3374c0c63f62d72176 /roles/os_firewall | |
| parent | fabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff) | |
| parent | 48778f29f265380a3e6fa2e882621ebc3781736b (diff) | |
| download | openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.gz openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.bz2 openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.xz openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.zip | |
Merge pull request #808 from sdodson/containers
Containerized install with SDN support
Diffstat (limited to 'roles/os_firewall')
| -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..d26ba7ee9 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_containerized | bool - name: Check if firewalld is installed command: rpm -q firewalld |