diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-19 15:17:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 15:17:04 -0800 |
| commit | c889d5f7e50bb9438c98459243ef03dbbb9035f5 (patch) | |
| tree | d9b99f020a92aae5001e5b385b25c805db2b1214 | |
| parent | 3c1eba1488e1d3570320381ee5eee6ea760e7659 (diff) | |
| parent | 4671dcc9292c2aa65e16afab323413efea5e68dc (diff) | |
| download | openshift-c889d5f7e50bb9438c98459243ef03dbbb9035f5.tar.gz openshift-c889d5f7e50bb9438c98459243ef03dbbb9035f5.tar.bz2 openshift-c889d5f7e50bb9438c98459243ef03dbbb9035f5.tar.xz openshift-c889d5f7e50bb9438c98459243ef03dbbb9035f5.zip | |
Merge pull request #6763 from sdodson/allow-firewalld-with-override
Automatic merge from submit-queue.
Allow for firewalld on atomic host
Right now this is only available on fedora so guard it with
openshift_enable_unsupported_configurations
| -rw-r--r-- | roles/os_firewall/tasks/firewalld.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/os_firewall/tasks/firewalld.yml b/roles/os_firewall/tasks/firewalld.yml index 4eae31596..fa933da51 100644 --- a/roles/os_firewall/tasks/firewalld.yml +++ b/roles/os_firewall/tasks/firewalld.yml @@ -2,7 +2,9 @@ - name: Fail - Firewalld is not supported on Atomic Host fail: msg: "Firewalld is not supported on Atomic Host" - when: r_os_firewall_is_atomic | bool + when: + - r_os_firewall_is_atomic | bool + - not openshift_enable_unsupported_configurations | default(false) - name: Install firewalld packages package: @@ -10,6 +12,7 @@ state: present register: result until: result is succeeded + when: not r_os_firewall_is_atomic | bool - name: Ensure iptables services are not enabled systemd: |