summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-08-25 15:50:35 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-08-25 15:50:35 -0400
commitd9d39f333fe7a68440faa1d433809f6f86bd116d (patch)
treea3d671342c40d903726fe30fcec7b220a7b4e7d5 /roles/openshift_hosted
parent7e369159e6e7d4ab6f54659eff0c02a54b3c3a6c (diff)
downloadopenshift-d9d39f333fe7a68440faa1d433809f6f86bd116d.tar.gz
openshift-d9d39f333fe7a68440faa1d433809f6f86bd116d.tar.bz2
openshift-d9d39f333fe7a68440faa1d433809f6f86bd116d.tar.xz
openshift-d9d39f333fe7a68440faa1d433809f6f86bd116d.zip
Default to global setting for firewall.
Diffstat (limited to 'roles/openshift_hosted')
-rw-r--r--roles/openshift_hosted/defaults/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml
index f0e303e43..f3747eead 100644
--- a/roles/openshift_hosted/defaults/main.yml
+++ b/roles/openshift_hosted/defaults/main.yml
@@ -1,9 +1,9 @@
---
-r_openshift_hosted_router_firewall_enabled: True
-r_openshift_hosted_router_use_firewalld: False
+r_openshift_hosted_router_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
+r_openshift_hosted_router_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
-r_openshift_hosted_registry_firewall_enabled: True
-r_openshift_hosted_registry_use_firewalld: False
+r_openshift_hosted_registry_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
+r_openshift_hosted_registry_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
openshift_hosted_router_wait: True
openshift_hosted_registry_wait: True