diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-02-17 15:49:42 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-02-17 15:49:42 -0600 |
| commit | ba4b6abb5fb2cc7f34b3f0ba5e8d3b8209748dd9 (patch) | |
| tree | f6738583aaed26494b2945479839b6e3be0a12b7 /roles | |
| parent | ed579ea3ef1611c6ff8ec6e920fcf6b6284df1e5 (diff) | |
| download | openshift-ba4b6abb5fb2cc7f34b3f0ba5e8d3b8209748dd9.tar.gz openshift-ba4b6abb5fb2cc7f34b3f0ba5e8d3b8209748dd9.tar.bz2 openshift-ba4b6abb5fb2cc7f34b3f0ba5e8d3b8209748dd9.tar.xz openshift-ba4b6abb5fb2cc7f34b3f0ba5e8d3b8209748dd9.zip | |
Updating to use uri module instead
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted_logging/handlers/main.yml | 20 | ||||
| -rw-r--r-- | roles/openshift_logging/handlers/main.yml | 20 |
2 files changed, 10 insertions, 30 deletions
diff --git a/roles/openshift_hosted_logging/handlers/main.yml b/roles/openshift_hosted_logging/handlers/main.yml index ffb812271..119a76a3a 100644 --- a/roles/openshift_hosted_logging/handlers/main.yml +++ b/roles/openshift_hosted_logging/handlers/main.yml @@ -5,22 +5,12 @@ notify: Verify API Server - name: Verify API Server - # 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 + uri: + url: "{{ openshift.master.api_url }}/healthz/ready" + return_content: yes + status_code: 200 register: api_available_output - until: api_available_output.stdout == 'ok' + until: "'ok' in api_available_output.content" retries: 120 delay: 1 changed_when: false diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml index ffb812271..119a76a3a 100644 --- a/roles/openshift_logging/handlers/main.yml +++ b/roles/openshift_logging/handlers/main.yml @@ -5,22 +5,12 @@ notify: Verify API Server - name: Verify API Server - # 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 + uri: + url: "{{ openshift.master.api_url }}/healthz/ready" + return_content: yes + status_code: 200 register: api_available_output - until: api_available_output.stdout == 'ok' + until: "'ok' in api_available_output.content" retries: 120 delay: 1 changed_when: false |