summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-08-10 21:13:54 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-08-10 22:59:48 -0400
commit7d50ffe98dfa17e3fb72627699c794843ed5295d (patch)
tree8292dff0a7ed50f79a728da44f40d3a08b397aaa /roles/openshift_hosted
parentba96f5eaf876f6b7568ac73794a08cbe759dceee (diff)
downloadopenshift-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/openshift_hosted')
-rw-r--r--roles/openshift_hosted/defaults/main.yml6
-rw-r--r--roles/openshift_hosted/tasks/registry/firewall.yml4
-rw-r--r--roles/openshift_hosted/tasks/router/firewall.yml4
3 files changed, 10 insertions, 4 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml
index f1fd0f4b7..13cbfb14e 100644
--- a/roles/openshift_hosted/defaults/main.yml
+++ b/roles/openshift_hosted/defaults/main.yml
@@ -1,4 +1,10 @@
---
+r_openshift_hosted_router_firewall_enabled: True
+r_openshift_hosted_router_use_firewalld: False
+
+r_openshift_hosted_registry_firewall_enabled: True
+r_openshift_hosted_registry_use_firewalld: False
+
registry_volume_claim: 'registry-claim'
openshift_hosted_router_edits:
diff --git a/roles/openshift_hosted/tasks/registry/firewall.yml b/roles/openshift_hosted/tasks/registry/firewall.yml
index f48eb3b12..775b7d6d7 100644
--- a/roles/openshift_hosted/tasks/registry/firewall.yml
+++ b/roles/openshift_hosted/tasks/registry/firewall.yml
@@ -1,5 +1,5 @@
---
-- when: os_firewall_enabled | bool and not os_firewall_use_firewalld | bool
+- when: r_openshift_hosted_registry_firewall_enabled | bool and not r_openshift_hosted_registry_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_openshift_hosted_registry_os_firewall_deny }}"
-- when: os_firewall_enabled | bool and os_firewall_use_firewalld | bool
+- when: r_openshift_hosted_registry_firewall_enabled | bool and r_openshift_hosted_registry_use_firewalld | bool
block:
- name: Add firewalld allow rules
firewalld:
diff --git a/roles/openshift_hosted/tasks/router/firewall.yml b/roles/openshift_hosted/tasks/router/firewall.yml
index fd9a9c2e7..ff90f3372 100644
--- a/roles/openshift_hosted/tasks/router/firewall.yml
+++ b/roles/openshift_hosted/tasks/router/firewall.yml
@@ -1,5 +1,5 @@
---
-- when: os_firewall_enabled | bool and not os_firewall_use_firewalld | bool
+- when: r_openshift_hosted_router_firewall_enabled | bool and not r_openshift_hosted_router_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_openshift_hosted_router_os_firewall_deny }}"
-- when: os_firewall_enabled | bool and os_firewall_use_firewalld | bool
+- when: r_openshift_hosted_router_firewall_enabled | bool and r_openshift_hosted_router_use_firewalld | bool
block:
- name: Add firewalld allow rules
firewalld: