summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/defaults
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-07 10:57:28 -0400
committerGitHub <noreply@github.com>2017-09-07 10:57:28 -0400
commit6da235f41a31776b1bc253a34dc14a30307e331e (patch)
treebda2cc62691a59fb6ac6ed4978fa7f15ec046121 /roles/openshift_hosted/defaults
parentaad4ccce7ce6641d3c720507568f6da779a66995 (diff)
parent8bf97723ceaca02fe12b86466f8383aa211ead5e (diff)
downloadopenshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.gz
openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.bz2
openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.xz
openshift-6da235f41a31776b1bc253a34dc14a30307e331e.zip
Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_hosted/defaults')
-rw-r--r--roles/openshift_hosted/defaults/main.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml
index c26df3afa..08c1d849e 100644
--- a/roles/openshift_hosted/defaults/main.yml
+++ b/roles/openshift_hosted/defaults/main.yml
@@ -47,3 +47,9 @@ r_openshift_hosted_registry_os_firewall_allow:
- service: Docker Registry Port
port: 5000/tcp
cond: "{{ r_openshift_hosted_use_calico }}"
+
+# NOTE
+# r_openshift_hosted_use_calico_default may be defined external to this role.
+# openshift_use_calico, if defined, may affect other roles or play behavior.
+r_openshift_hosted_use_calico_default: "{{ openshift_use_calico | default(False) }}"
+r_openshift_hosted_use_calico: "{{ r_openshift_hosted_use_calico_default }}"