diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-08-10 21:13:54 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-10 22:59:48 -0400 |
| commit | 7d50ffe98dfa17e3fb72627699c794843ed5295d (patch) | |
| tree | 8292dff0a7ed50f79a728da44f40d3a08b397aaa /roles/cockpit | |
| parent | ba96f5eaf876f6b7568ac73794a08cbe759dceee (diff) | |
| download | openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.gz openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.bz2 openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.tar.xz openshift-7d50ffe98dfa17e3fb72627699c794843ed5295d.zip | |
Updated README to reflect refactor. Moved firewall initialize into separate file.
Diffstat (limited to 'roles/cockpit')
| -rw-r--r-- | roles/cockpit/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/cockpit/tasks/firewall.yml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roles/cockpit/defaults/main.yml b/roles/cockpit/defaults/main.yml index 97b00db04..cbe5bb92b 100644 --- a/roles/cockpit/defaults/main.yml +++ b/roles/cockpit/defaults/main.yml @@ -1,4 +1,7 @@ --- +r_cockpit_firewall_enabled: True +r_cockpit_use_firewalld: False + r_cockpit_os_firewall_deny: [] r_cockpit_os_firewall_allow: - service: cockpit-ws diff --git a/roles/cockpit/tasks/firewall.yml b/roles/cockpit/tasks/firewall.yml index 0e253a9f5..e597ac84d 100644 --- a/roles/cockpit/tasks/firewall.yml +++ b/roles/cockpit/tasks/firewall.yml @@ -1,5 +1,5 @@ --- -- when: os_firewall_enabled | bool and not os_firewall_use_firewalld | bool +- when: r_cockpit_firewall_enabled | bool and not r_cockpit_use_firewalld | bool block: - name: Add iptables allow rules os_firewall_manage_iptables: @@ -19,7 +19,7 @@ when: item.cond | default(True) with_items: "{{ r_cockpit_os_firewall_deny }}" -- when: os_firewall_enabled | bool and os_firewall_use_firewalld | bool +- when: r_cockpit_firewall_enabled | bool and r_cockpit_use_firewalld | bool block: - name: Add firewalld allow rules firewalld: |