diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-05 16:10:32 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-05 16:12:10 -0500 |
| commit | 5a964c9cbd3c83d1dcfe50ce99e9dcd0a8120c9a (patch) | |
| tree | 04e6067ce16504d2b6ae5bb219c80bf5bde078e0 | |
| parent | fabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff) | |
| download | openshift-5a964c9cbd3c83d1dcfe50ce99e9dcd0a8120c9a.tar.gz openshift-5a964c9cbd3c83d1dcfe50ce99e9dcd0a8120c9a.tar.bz2 openshift-5a964c9cbd3c83d1dcfe50ce99e9dcd0a8120c9a.tar.xz openshift-5a964c9cbd3c83d1dcfe50ce99e9dcd0a8120c9a.zip | |
Add ability to disable os_firewall
| -rw-r--r-- | roles/os_firewall/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/os_firewall/tasks/main.yml | 4 |
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 |