summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-19 16:21:20 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-19 16:21:20 -0500
commit20f9b4997f208e9374a4e74b79af64e0e25e4c0d (patch)
tree3e3a4d188a441ba77768bce2b5b47b4976c645e7 /roles
parent8ce35b40a55f46f716f280054594c8b5d39cd547 (diff)
parent5a964c9cbd3c83d1dcfe50ce99e9dcd0a8120c9a (diff)
downloadopenshift-20f9b4997f208e9374a4e74b79af64e0e25e4c0d.tar.gz
openshift-20f9b4997f208e9374a4e74b79af64e0e25e4c0d.tar.bz2
openshift-20f9b4997f208e9374a4e74b79af64e0e25e4c0d.tar.xz
openshift-20f9b4997f208e9374a4e74b79af64e0e25e4c0d.zip
Merge pull request #1118 from detiber/os_firewall_disable
Add ability to disable os_firewall
Diffstat (limited to 'roles')
-rw-r--r--roles/os_firewall/defaults/main.yml1
-rw-r--r--roles/os_firewall/tasks/main.yml4
2 files changed, 3 insertions, 2 deletions
diff --git a/roles/os_firewall/defaults/main.yml b/roles/os_firewall/defaults/main.yml
index bcf1d9a34..e3176e611 100644
--- a/roles/os_firewall/defaults/main.yml
+++ b/roles/os_firewall/defaults/main.yml
@@ -1,2 +1,3 @@
---
+os_firewall_enabled: True
os_firewall_use_firewalld: True
diff --git a/roles/os_firewall/tasks/main.yml b/roles/os_firewall/tasks/main.yml
index ad89ef97c..076e5e311 100644
--- a/roles/os_firewall/tasks/main.yml
+++ b/roles/os_firewall/tasks/main.yml
@@ -1,6 +1,6 @@
---
- include: firewall/firewalld.yml
- when: os_firewall_use_firewalld
+ when: os_firewall_enabled | bool and os_firewall_use_firewalld | bool
- include: firewall/iptables.yml
- when: not os_firewall_use_firewalld
+ when: os_firewall_enabled | bool and not os_firewall_use_firewalld | bool