From ef5fb419dc66192a787c2b992b96669e893417cb Mon Sep 17 00:00:00 2001 From: Justin Cinkelj Date: Mon, 8 May 2023 10:26:03 +0200 Subject: [PATCH 1/2] Fix update_status_check.yml to work on clean cluster too On clean cluster version_update_status_info returns update_status=None Signed-off-by: Justin Cinkelj --- .../tasks/update_status_check.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/version_update_single_node/tasks/update_status_check.yml b/roles/version_update_single_node/tasks/update_status_check.yml index c0aac6f40..394e77676 100644 --- a/roles/version_update_single_node/tasks/update_status_check.yml +++ b/roles/version_update_single_node/tasks/update_status_check.yml @@ -14,7 +14,12 @@ - name: Check update status - will report FAILED-RETRYING until update COMPLETE/TERMINATED scale_computing.hypercore.version_update_status_info: register: update_status - until: update_status.record.update_status == "COMPLETE" | default(omit) or update_status.record.update_status == "TERMINATING" | default(omit) + until: >- + update_status.record != None and + ( + update_status.record.update_status == "COMPLETE" or + update_status.record.update_status == "TERMINATING" + ) retries: 100 delay: 30 ignore_unreachable: true From 355e65a6254883da54796665ac063b4c2d78d29c Mon Sep 17 00:00:00 2001 From: Justin Cinkelj Date: Mon, 8 May 2023 10:27:32 +0200 Subject: [PATCH 2/2] Remove unneede delay update_status_check taksfile now works also when update_status=None. Signed-off-by: Justin Cinkelj --- .../tasks/update_status_check.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/roles/version_update_single_node/tasks/update_status_check.yml b/roles/version_update_single_node/tasks/update_status_check.yml index 394e77676..729791592 100644 --- a/roles/version_update_single_node/tasks/update_status_check.yml +++ b/roles/version_update_single_node/tasks/update_status_check.yml @@ -5,12 +5,6 @@ ansible.builtin.set_fact: retry_count: "{{ 0 if retry_count is undefined else retry_count | int + 1 }}" - # We might be able to remove this task - - name: Pause before checking update status - checks will report FAILED-RETRYING until update COMPLETE/TERMINATED - ansible.builtin.wait_for: - timeout: 60 - delegate_to: localhost - - name: Check update status - will report FAILED-RETRYING until update COMPLETE/TERMINATED scale_computing.hypercore.version_update_status_info: register: update_status