Use block/rescue for error handling

Instead of allowing the first task to fail, then
using the fallback - use block/rescue to achieve
the same, but totally skip the second task if the
first succeeds.

Change-Id: Ida644fee4f9842a45bf273db379b00df12bec695

tasks/galera_install_apt.yml

@@ -14,6 +14,8 @@
 # limitations under the License.
 
 - name: Add galera apt-keys
+  block:
+    - name: Add keys (primary keyserver)
       apt_key:
         id: "{{ item.hash_id }}"
         keyserver: "{{ item.keyserver | default(omit) }}"
@@ -22,14 +24,14 @@
         state: "present"
       register: add_keys
       until: add_keys|success
-  failed_when: false
       retries: 5
       delay: 2
       with_items: "{{ galera_gpg_keys }}"
       tags:
         - galera-apt-keys
 
-- name: Add galera apt-keys using fallback keyserver
+  rescue:
+    - name: Add keys (fallback keyserver)
       apt_key:
         id: "{{ item.hash_id }}"
         keyserver: "{{ item.fallback_keyserver | default(omit) }}"
@@ -40,7 +42,8 @@
       retries: 5
       delay: 2
       with_items: "{{ galera_gpg_keys }}"
-  when: add_keys|failed and (item.fallback_keyserver is defined or item.fallback_url is defined)
+      when:
+        - item.fallback_keyserver is defined or item.fallback_url is defined
       tags:
         - galera-apt-keys
 

tasks/galera_install_yum.yml

@@ -27,19 +27,21 @@
     - { src: "/etc/mysql/my.cnf", path: "/etc/my.cnf", state: "link", force: true }
 
 - name: Add galera gpg-keys
+  block:
+    - name: Add keys (primary keyserver)
       rpm_key:
         state: present
         key: "{{ item.keyserver }}/{{ item.key_name }}"
       register: add_keys
       until: add_keys|success
-  failed_when: false
       retries: 5
       delay: 2
       with_items: "{{ galera_gpg_keys }}"
       tags:
         - galera-gpg-keys
 
-- name: Add galera gpg-keys using fallback keyserver
+  rescue:
+    - name: Add keys (fallback keyserver)
       rpm_key:
         state: present
         key: "{{ item.fallback_keyserver }}/{{ item.key_name }}"
@@ -48,7 +50,7 @@
       retries: 5
       delay: 2
       with_items: "{{ galera_gpg_keys }}"
-  when: add_keys|failed and (item.fallback_keyserver is defined)
+      when: item.fallback_keyserver is defined
       tags:
         - galera-gpg-keys