openstack/openstack-ansible-galera_server
Code Issues Proposed changes

Use block/rescue for error handling

Browse Source 
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
This commit is contained in:
Jesse Pretorius
2017-08-11 09:04:39 +01:00
committed by Jesse Pretorius (odyssey4me)
parent 922dec35b9
commit 3ebde68b53
2 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tasks/galera_install_apt.yml
View File

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

8
tasks/galera_install_yum.yml
View File

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