summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-03-15 15:32:43 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-03-15 15:32:43 -0400
commit837fe7dc76a186e8dbae656170c64d719d842984 (patch)
treee0243e3dd39418a88ade51aa580047c9bb45521a /roles/openshift_master
parenta9ff7af9354292be391f017efb83b998ce23c63f (diff)
downloadopenshift-837fe7dc76a186e8dbae656170c64d719d842984.tar.gz
openshift-837fe7dc76a186e8dbae656170c64d719d842984.tar.bz2
openshift-837fe7dc76a186e8dbae656170c64d719d842984.tar.xz
openshift-837fe7dc76a186e8dbae656170c64d719d842984.zip
Provide cacert when performing health checks
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/handlers/main.yml3
-rw-r--r--roles/openshift_master/tasks/main.yml3
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index 4d1216aae..e5b9e4977 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -17,7 +17,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.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/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 1f499dc93..9c3d09d09 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -282,7 +282,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.common.config_base }}/master/ca.crt
+ {{ openshift.master.api_url }}/healthz/ready
register: api_available_output
until: api_available_output.stdout == 'ok'
retries: 120