From ed579ea3ef1611c6ff8ec6e920fcf6b6284df1e5 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Fri, 17 Feb 2017 14:09:08 -0600 Subject: Adding missing handler to resolve error that it was not found --- roles/openshift_hosted_logging/handlers/main.yml | 21 +++++++++++++++++++++ roles/openshift_logging/handlers/main.yml | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) (limited to 'roles') 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 -- cgit v1.2.3 From ba4b6abb5fb2cc7f34b3f0ba5e8d3b8209748dd9 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Fri, 17 Feb 2017 15:49:42 -0600 Subject: Updating to use uri module instead --- roles/openshift_hosted_logging/handlers/main.yml | 20 +++++--------------- roles/openshift_logging/handlers/main.yml | 20 +++++--------------- 2 files changed, 10 insertions(+), 30 deletions(-) (limited to 'roles') 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 -- cgit v1.2.3 From 3045d2d7aebe0e971e1443d94e5d23fc1f1d24e9 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Fri, 17 Feb 2017 16:41:21 -0600 Subject: updating until statments on uri module for api verification --- roles/openshift_hosted_logging/handlers/main.yml | 2 +- roles/openshift_logging/handlers/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roles') diff --git a/roles/openshift_hosted_logging/handlers/main.yml b/roles/openshift_hosted_logging/handlers/main.yml index 119a76a3a..2f83dd41b 100644 --- a/roles/openshift_hosted_logging/handlers/main.yml +++ b/roles/openshift_hosted_logging/handlers/main.yml @@ -10,7 +10,7 @@ return_content: yes status_code: 200 register: api_available_output - until: "'ok' in api_available_output.content" + until: api_available_output | succeeded retries: 120 delay: 1 changed_when: false diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml index 119a76a3a..2f83dd41b 100644 --- a/roles/openshift_logging/handlers/main.yml +++ b/roles/openshift_logging/handlers/main.yml @@ -10,7 +10,7 @@ return_content: yes status_code: 200 register: api_available_output - until: "'ok' in api_available_output.content" + until: api_available_output | succeeded retries: 120 delay: 1 changed_when: false -- cgit v1.2.3 From df6382a09b156a5d765f8d4d3d3c6219e4718218 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Mon, 20 Feb 2017 14:42:53 -0600 Subject: Reverting logic for verify api handler to be uniform with other ways we verify, will be uniformly updated in future --- roles/openshift_hosted_logging/handlers/main.yml | 20 +++++++++++++++----- roles/openshift_logging/handlers/main.yml | 20 +++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) (limited to 'roles') 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 -- cgit v1.2.3