diff options
| author | Russell Teague <rteague@redhat.com> | 2016-11-16 16:30:28 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2016-11-17 15:10:37 -0500 |
| commit | 7e0c346c8406eb6142e8d38fdec4e13236f3cdc6 (patch) | |
| tree | 2bc96a95a6b60cdcc7278966886b14079c71f7eb /roles/os_firewall/tasks | |
| parent | ac1b73841a109f6e9f6947434a9e1aca382e61c6 (diff) | |
| download | openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.tar.gz openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.tar.bz2 openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.tar.xz openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.zip | |
Refactor to use Ansible package module
The Ansible package module will call the correct package manager for the
underlying OS.
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 |