diff options
| author | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
| commit | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (patch) | |
| tree | 70eee046db8012061c178ab4e686650048265564 /roles/os_firewall | |
| parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
| parent | b7b3e6dbdfd17e55055630ce963965818e830620 (diff) | |
| download | openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.gz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.bz2 openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.xz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.zip | |
Merge remote-tracking branch 'upstream/master' into prod
Diffstat (limited to 'roles/os_firewall')
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 8 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml index 5089eb3e0..cf2a2c733 100644 --- a/roles/os_firewall/tasks/firewall/firewalld.yml +++ b/roles/os_firewall/tasks/firewall/firewalld.yml @@ -3,6 +3,14 @@ yum: name: firewalld state: present + when: ansible_pkg_mgr == "yum" + register: install_result + +- name: Install firewalld packages + dnf: + name: firewalld + state: present + when: ansible_pkg_mgr == "dnf" 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 9af9d8d29..36d51504c 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -6,6 +6,17 @@ with_items: - iptables - iptables-services + when: ansible_pkg_mgr == "yum" + register: install_result + +- name: Install iptables packages + dnf: + name: "{{ item }}" + state: present + with_items: + - iptables + - iptables-services + when: ansible_pkg_mgr == "dnf" register: install_result - name: Check if firewalld is installed |