summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-26 14:12:08 -0400
committerGitHub <noreply@github.com>2017-08-26 14:12:08 -0400
commitcc45402b22703aedb9986fa9a95f530a11633edb (patch)
tree7a204b4c0d42cc90ad78dcaafa8ef745a1cb7239 /roles/openshift_hosted
parent959e6c311ead326f57fe967b646f44beb4b53bbb (diff)
parentd9d39f333fe7a68440faa1d433809f6f86bd116d (diff)
downloadopenshift-cc45402b22703aedb9986fa9a95f530a11633edb.tar.gz
openshift-cc45402b22703aedb9986fa9a95f530a11633edb.tar.bz2
openshift-cc45402b22703aedb9986fa9a95f530a11633edb.tar.xz
openshift-cc45402b22703aedb9986fa9a95f530a11633edb.zip
Merge pull request #5227 from kwoodson/firewall_defaults_fix
Merged by openshift-bot
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