summaryrefslogtreecommitdiffstats
path: root/roles/os_firewall
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-12-09 15:06:48 -0500
committerScott Dodson <sdodson@redhat.com>2015-12-09 16:43:27 -0500
commitb1d30491f1581503003646684137bf2c218660ba (patch)
treecba54e9138630742d0788a5cff9f70ec75b93032 /roles/os_firewall
parentecae1fcaaf6d83f2fb6dce0624990b2d13c25db9 (diff)
downloadopenshift-b1d30491f1581503003646684137bf2c218660ba.tar.gz
openshift-b1d30491f1581503003646684137bf2c218660ba.tar.bz2
openshift-b1d30491f1581503003646684137bf2c218660ba.tar.xz
openshift-b1d30491f1581503003646684137bf2c218660ba.zip
Remove yum / dnf duplication
Diffstat (limited to 'roles/os_firewall')
-rw-r--r--roles/os_firewall/tasks/firewall/firewalld.yml12
-rw-r--r--roles/os_firewall/tasks/firewall/iptables.yml15
2 files changed, 2 insertions, 25 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml
index cf2a2c733..ba12c6b0c 100644
--- a/roles/os_firewall/tasks/firewall/firewalld.yml
+++ b/roles/os_firewall/tasks/firewall/firewalld.yml
@@ -1,16 +1,6 @@
---
- name: Install firewalld packages
- 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"
+ action: "{{ ansible_pkg_mgr }} name=firewalld state=present"
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 36d51504c..d3a5b1fa7 100644
--- a/roles/os_firewall/tasks/firewall/iptables.yml
+++ b/roles/os_firewall/tasks/firewall/iptables.yml
@@ -1,22 +1,9 @@
---
- name: Install iptables packages
- yum:
- name: "{{ item }}"
- state: present
+ action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
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