summaryrefslogtreecommitdiffstats
path: root/roles/os_firewall
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-12-02 16:23:36 -0500
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-12-02 16:23:36 -0500
commitf7835bc727bb2a290ebc42be9e16f3d775b2588b (patch)
treee40313defb290c23963d0abddd212b951c354baa /roles/os_firewall
parente14da724f79e1fd75aea03bfab2179c7ef42c3e6 (diff)
parentaf009a7a51d7b6f5799a14c452cc7db92727135e (diff)
downloadopenshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.gz
openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.bz2
openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.xz
openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.zip
Merge pull request #966 from maxamillion/fedora
Fedora changes:
Diffstat (limited to 'roles/os_firewall')
-rw-r--r--roles/os_firewall/tasks/firewall/firewalld.yml8
-rw-r--r--roles/os_firewall/tasks/firewall/iptables.yml11
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