From 5038acc3907c75d6a5ff1af6382e5abec4ea1650 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 14 Oct 2016 16:43:57 -0500 Subject: [PATCH] Remove 'ignore_errors: true' in favor of 'failed_when: false' This change removes the use of 'ignore_errors: true' because it causes deployers to see red output and a stacktrace, which traditionally means something is broken, even when the failure is known to have a fall back option or be intentional. This conversion will provide a generally cleaner interface. It should be noted that the 'failed' filter will still function normally. Tasks with the 'failed_when: false' option will still be marked as 'failed' in any registered variable. This change simply makes the output look cleaner. Change-Id: I2a40fa9a0da45602a76f2d56611971fcf4063512 Closes-Bug: #1633438 Signed-off-by: Kevin Carter --- tasks/galera_cluster_state.yml | 2 +- tasks/galera_install_apt.yml | 2 +- tasks/galera_install_yum.yml | 2 +- tasks/galera_upgrade_check_apt.yml | 4 ++-- tasks/galera_upgrade_check_yum.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/galera_cluster_state.yml b/tasks/galera_cluster_state.yml index 884aea66..7f1bdf40 100644 --- a/tasks/galera_cluster_state.yml +++ b/tasks/galera_cluster_state.yml @@ -33,7 +33,7 @@ - name: Gather mysql facts mysql_status_facts: - ignore_errors: true + failed_when: false tags: - galera-cluster-state-check diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml index abc83922..e06a718d 100644 --- a/tasks/galera_install_apt.yml +++ b/tasks/galera_install_apt.yml @@ -51,7 +51,7 @@ state: "present" register: add_keys until: add_keys|success - ignore_errors: True + failed_when: false retries: 5 delay: 2 with_items: "{{ galera_gpg_keys }}" diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml index 91e64014..5d951778 100644 --- a/tasks/galera_install_yum.yml +++ b/tasks/galera_install_yum.yml @@ -34,7 +34,7 @@ key: "{{ item.keyserver }}/{{ item.key_name }}" register: add_keys until: add_keys|success - ignore_errors: True + failed_when: false retries: 5 delay: 2 with_items: "{{ galera_client_gpg_keys }}" diff --git a/tasks/galera_upgrade_check_apt.yml b/tasks/galera_upgrade_check_apt.yml index 1e19e6ee..bcd3fff6 100644 --- a/tasks/galera_upgrade_check_apt.yml +++ b/tasks/galera_upgrade_check_apt.yml @@ -15,7 +15,7 @@ - name: Check major galera install version command: "dpkg -s {{ galera_mariadb_apt_server_package }}" - ignore_errors: true + failed_when: false register: installed_galera_specific when: - not galera_upgrade | bool @@ -28,7 +28,7 @@ - name: Check for any galera install version shell: | dpkg --get-selections | grep mariadb-galera-server - ignore_errors: true + failed_when: false register: installed_galera_any when: - not galera_upgrade | bool diff --git a/tasks/galera_upgrade_check_yum.yml b/tasks/galera_upgrade_check_yum.yml index 10dc1ed8..32d54c3b 100644 --- a/tasks/galera_upgrade_check_yum.yml +++ b/tasks/galera_upgrade_check_yum.yml @@ -15,7 +15,7 @@ - name: Check major galera install version command: "rpm -qi '{{ galera_mariadb_yum_server_package }}'" - ignore_errors: true + failed_when: false register: installed_galera_specific when: - not galera_upgrade | bool @@ -28,7 +28,7 @@ - name: Check for any galera install version shell: | rpm -qa | grep -i "{{ galera_mariadb_yum_server_package }}" - ignore_errors: true + failed_when: false register: installed_galera_any when: - not galera_upgrade | bool