diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-21 16:26:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 16:26:21 -0500 |
| commit | 4954982b72451f82bd40802b0bdf39379ad4bdf1 (patch) | |
| tree | b890599b1719b630e3fae8197f9d8417e9a29c20 /roles/os_firewall/tasks | |
| parent | e34870e2b1b452f9719d14911d7a2a557ca701bd (diff) | |
| parent | 7e0c346c8406eb6142e8d38fdec4e13236f3cdc6 (diff) | |
| download | openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.tar.gz openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.tar.bz2 openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.tar.xz openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.zip | |
Merge pull request #2818 from mtnbikenc/package-refactor
Refactor to use Ansible package module
Diffstat (limited to 'roles/os_firewall/tasks')
| -rw-r--r-- | roles/os_firewall/tasks/firewall/firewalld.yml | 2 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/firewall/iptables.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/os_firewall/tasks/firewall/firewalld.yml b/roles/os_firewall/tasks/firewall/firewalld.yml index 5ddca1fc0..a5b733cb7 100644 --- a/roles/os_firewall/tasks/firewall/firewalld.yml +++ b/roles/os_firewall/tasks/firewall/firewalld.yml @@ -1,6 +1,6 @@ --- - name: Install firewalld packages - action: "{{ ansible_pkg_mgr }} name=firewalld state=present" + package: name=firewalld state=present when: not openshift.common.is_containerized | bool register: install_result diff --git a/roles/os_firewall/tasks/firewall/iptables.yml b/roles/os_firewall/tasks/firewall/iptables.yml index 470d4f4f9..366ede8fd 100644 --- a/roles/os_firewall/tasks/firewall/iptables.yml +++ b/roles/os_firewall/tasks/firewall/iptables.yml @@ -25,7 +25,7 @@ ignore_errors: yes - name: Install iptables packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + package: name={{ item }} state=present with_items: - iptables - iptables-services |