summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node/config.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-03 13:03:46 -0400
committerGitHub <noreply@github.com>2016-08-03 13:03:46 -0400
commit71bc6b9a67d83c0618ac9a786a6cb0d1abd907da (patch)
treed6d4151be2a2e5621559f8584c3c7aa957e386aa /playbooks/common/openshift-node/config.yml
parent723c1fb1d73582cd0209cdc7201231b258161555 (diff)
parent4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933 (diff)
downloadopenshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.tar.gz
openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.tar.bz2
openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.tar.xz
openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.zip
Merge pull request #2049 from abutcher/named-certificates
Named CA Certificates
Diffstat (limited to 'playbooks/common/openshift-node/config.yml')
-rw-r--r--playbooks/common/openshift-node/config.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 2e0ec2ca7..c56353430 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -168,7 +168,12 @@
# Using curl here since the uri module requires python-httplib2 and
# wait_for port doesn't provide health information.
command: >
- curl --silent --cacert {{ openshift.common.config_base }}/master/ca.crt
+ curl --silent
+ {% if openshift.common.version_gte_3_2_or_1_2 | bool %}
+ --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
+ {% else %}
+ --cacert {{ openshift.common.config_base }}/master/ca.crt
+ {% endif %}
{{ openshift.master.api_url }}/healthz/ready
register: api_available_output
until: api_available_output.stdout == 'ok'