summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-06-15 13:19:59 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-08-01 11:33:14 -0400
commit4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933 (patch)
tree57f0d2ee98a622e012d339c044e84d5855718949 /playbooks/common/openshift-node
parent1bdbe5ed4b609d06651d4d3ded4dc70a7f7ed865 (diff)
downloadopenshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.tar.gz
openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.tar.bz2
openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.tar.xz
openshift-4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933.zip
Add options for specifying named ca certificates to be added to the openshift ca bundle.
Diffstat (limited to 'playbooks/common/openshift-node')
-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 fc6e57439..871f9211a 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -245,7 +245,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'