diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-09 16:44:55 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-09 16:44:55 -0500 |
| commit | ec7b8b68b6467e17487ec4c81fbe2c6826e3c889 (patch) | |
| tree | cba54e9138630742d0788a5cff9f70ec75b93032 /roles/os_firewall | |
| parent | ecae1fcaaf6d83f2fb6dce0624990b2d13c25db9 (diff) | |
| parent | b1d30491f1581503003646684137bf2c218660ba (diff) | |
| download | openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.tar.gz openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.tar.bz2 openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.tar.xz openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.zip | |
Merge pull request #1046 from sdodson/yum-dnf-cleanup
Remove yum / dnf duplication
Diffstat (limited to 'roles/os_firewall')
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 12 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 15 |
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 |