summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-16 07:49:03 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-16 07:49:03 -0400
commitabe9fa08433377d881649968766e3c9b68db916e (patch)
tree91725889df1a7190d7e84b2ad8d9a64a5583bc0d /playbooks
parent4551e7cddf4a9d1756a064fd31777b6bed7d3567 (diff)
parent837fe7dc76a186e8dbae656170c64d719d842984 (diff)
downloadopenshift-abe9fa08433377d881649968766e3c9b68db916e.tar.gz
openshift-abe9fa08433377d881649968766e3c9b68db916e.tar.bz2
openshift-abe9fa08433377d881649968766e3c9b68db916e.tar.xz
openshift-abe9fa08433377d881649968766e3c9b68db916e.zip
Merge pull request #1609 from abutcher/check-w-certs
Provide cacert when performing health checks
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-master/scaleup.yml3
-rw-r--r--playbooks/common/openshift-node/config.yml3
2 files changed, 4 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml
index ccb1d23f1..6e6cb3e01 100644
--- a/playbooks/common/openshift-master/scaleup.yml
+++ b/playbooks/common/openshift-master/scaleup.yml
@@ -33,7 +33,8 @@
service: name={{ openshift.common.service_type }}-master-controllers state=restarted
- name: verify api server
command: >
- curl -k --silent {{ openshift.master.api_url }}/healthz/ready
+ curl --silent --cacert {{ openshift.common.config_base }}/master/ca.crt
+ {{ openshift.master.api_url }}/healthz/ready
register: api_available_output
until: api_available_output.stdout == 'ok'
retries: 120
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 1f32f2786..aa71ab703 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -256,7 +256,8 @@
# Using curl here since the uri module requires python-httplib2 and
# wait_for port doesn't provide health information.
command: >
- curl -k --silent {{ openshift.master.api_url }}/healthz/ready
+ curl --silent --cacert {{ openshift.master.config_dir }}/master/ca.crt
+ {{ openshift.master.api_url }}/healthz/ready
register: api_available_output
until: api_available_output.stdout == 'ok'
retries: 120