summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-02-20 14:42:53 -0600
committerewolinetz <ewolinet@redhat.com>2017-02-20 14:42:53 -0600
commitdf6382a09b156a5d765f8d4d3d3c6219e4718218 (patch)
tree9452cbf53a363e16ecbf023a5bdf15d3979c7314
parent3045d2d7aebe0e971e1443d94e5d23fc1f1d24e9 (diff)
downloadopenshift-df6382a09b156a5d765f8d4d3d3c6219e4718218.tar.gz
openshift-df6382a09b156a5d765f8d4d3d3c6219e4718218.tar.bz2
openshift-df6382a09b156a5d765f8d4d3d3c6219e4718218.tar.xz
openshift-df6382a09b156a5d765f8d4d3d3c6219e4718218.zip
Reverting logic for verify api handler to be uniform with other ways we verify, will be uniformly updated in future
-rw-r--r--roles/openshift_hosted_logging/handlers/main.yml20
-rw-r--r--roles/openshift_logging/handlers/main.yml20
2 files changed, 30 insertions, 10 deletions
diff --git a/roles/openshift_hosted_logging/handlers/main.yml b/roles/openshift_hosted_logging/handlers/main.yml
index 2f83dd41b..ffb812271 100644
--- a/roles/openshift_hosted_logging/handlers/main.yml
+++ b/roles/openshift_hosted_logging/handlers/main.yml
@@ -5,12 +5,22 @@
notify: Verify API Server
- name: Verify API Server
- uri:
- url: "{{ openshift.master.api_url }}/healthz/ready"
- return_content: yes
- status_code: 200
+ # Using curl here since the uri module requires python-httplib2 and
+ # wait_for port doesn't provide health information.
+ command: >
+ curl --silent --tlsv1.2
+ {% 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
+ args:
+ # Disables the following warning:
+ # Consider using get_url or uri module rather than running curl
+ warn: no
register: api_available_output
- until: api_available_output | succeeded
+ until: api_available_output.stdout == 'ok'
retries: 120
delay: 1
changed_when: false
diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml
index 2f83dd41b..ffb812271 100644
--- a/roles/openshift_logging/handlers/main.yml
+++ b/roles/openshift_logging/handlers/main.yml
@@ -5,12 +5,22 @@
notify: Verify API Server
- name: Verify API Server
- uri:
- url: "{{ openshift.master.api_url }}/healthz/ready"
- return_content: yes
- status_code: 200
+ # Using curl here since the uri module requires python-httplib2 and
+ # wait_for port doesn't provide health information.
+ command: >
+ curl --silent --tlsv1.2
+ {% 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
+ args:
+ # Disables the following warning:
+ # Consider using get_url or uri module rather than running curl
+ warn: no
register: api_available_output
- until: api_available_output | succeeded
+ until: api_available_output.stdout == 'ok'
retries: 120
delay: 1
changed_when: false