diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
| commit | 9410cdff9342fae80a3149c530b819e473996cce (patch) | |
| tree | cf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /roles/os_firewall/tasks | |
| parent | a2b745039bce597d419b03fdce39b4c6c69139f6 (diff) | |
| parent | bdedb63403ea582c4aaa5f56caed302f51744de2 (diff) | |
| download | openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2 openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz openshift-9410cdff9342fae80a3149c530b819e473996cce.zip | |
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/os_firewall/tasks')
| -rw-r--r-- | roles/os_firewall/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |