diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-20 15:53:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 15:53:27 -0500 |
| commit | c9563d87c6de11503c5e8fe29a794b8c2846afcc (patch) | |
| tree | 569c7bd689dcba6a6fd15d25ecf4dc1ba46eeba1 | |
| parent | c0e7beaddd461f64fcbbd9395dc4ed8a1e7dbb04 (diff) | |
| parent | df6382a09b156a5d765f8d4d3d3c6219e4718218 (diff) | |
| download | openshift-c9563d87c6de11503c5e8fe29a794b8c2846afcc.tar.gz openshift-c9563d87c6de11503c5e8fe29a794b8c2846afcc.tar.bz2 openshift-c9563d87c6de11503c5e8fe29a794b8c2846afcc.tar.xz openshift-c9563d87c6de11503c5e8fe29a794b8c2846afcc.zip | |
Merge pull request #3409 from ewolinetz/logging_fix_verify_api
Adding missing handler to resolve error that it was not found
| -rw-r--r-- | roles/openshift_hosted_logging/handlers/main.yml | 21 | ||||
| -rw-r--r-- | roles/openshift_logging/handlers/main.yml | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/roles/openshift_hosted_logging/handlers/main.yml b/roles/openshift_hosted_logging/handlers/main.yml index ad79e62ae..ffb812271 100644 --- a/roles/openshift_hosted_logging/handlers/main.yml +++ b/roles/openshift_hosted_logging/handlers/main.yml @@ -3,3 +3,24 @@ systemd: name={{ openshift.common.service_type }}-master state=restarted when: (openshift.master.ha is not defined or not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) 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 + register: api_available_output + 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 ad79e62ae..ffb812271 100644 --- a/roles/openshift_logging/handlers/main.yml +++ b/roles/openshift_logging/handlers/main.yml @@ -3,3 +3,24 @@ systemd: name={{ openshift.common.service_type }}-master state=restarted when: (openshift.master.ha is not defined or not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) 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 + register: api_available_output + until: api_available_output.stdout == 'ok' + retries: 120 + delay: 1 + changed_when: false |