Remove duplicate when conditions
The 'galera_upgrade | bool' when clause is already being applied to each task of the galera_upgrade_pre and galera_upgrade_post task files when they are included. Change-Id: I676665aa6230ea2fafa8a90ef7fec1d8eeddf0f8
This commit is contained in:
parent
062566ee15
commit
1f056e32c7
@ -28,8 +28,6 @@
|
|||||||
done
|
done
|
||||||
echo "Service failed to start"
|
echo "Service failed to start"
|
||||||
exit 1
|
exit 1
|
||||||
when:
|
|
||||||
- galera_upgrade | bool
|
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
|
|
||||||
@ -44,7 +42,5 @@
|
|||||||
until: galera_mysql_upgrade | success
|
until: galera_mysql_upgrade | success
|
||||||
retries: 3
|
retries: 3
|
||||||
delay: 10
|
delay: 10
|
||||||
when:
|
|
||||||
- galera_upgrade | bool
|
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
|
@ -16,8 +16,6 @@
|
|||||||
- name: Set fact to ignore cluster state
|
- name: Set fact to ignore cluster state
|
||||||
set_fact:
|
set_fact:
|
||||||
galera_ignore_cluster_state: true
|
galera_ignore_cluster_state: true
|
||||||
when:
|
|
||||||
- galera_upgrade | bool
|
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
|
|
||||||
@ -29,8 +27,6 @@
|
|||||||
until: galera_restart_fall_back | success
|
until: galera_restart_fall_back | success
|
||||||
retries: 3
|
retries: 3
|
||||||
delay: 5
|
delay: 5
|
||||||
when:
|
|
||||||
- galera_upgrade | bool
|
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
|
|
||||||
@ -38,8 +34,6 @@
|
|||||||
shell: |
|
shell: |
|
||||||
grep -rnil maria /etc/apt/sources.list.d/*
|
grep -rnil maria /etc/apt/sources.list.d/*
|
||||||
register: old_sources
|
register: old_sources
|
||||||
when:
|
|
||||||
- galera_upgrade | bool
|
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
- galera-apt-packages
|
- galera-apt-packages
|
||||||
@ -49,8 +43,6 @@
|
|||||||
path: "{{ item }}"
|
path: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: "{{ old_sources.stdout_lines | default([]) }}"
|
with_items: "{{ old_sources.stdout_lines | default([]) }}"
|
||||||
when:
|
|
||||||
- galera_upgrade | bool
|
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
- galera-apt-packages
|
- galera-apt-packages
|
||||||
@ -64,7 +56,6 @@
|
|||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
when:
|
when:
|
||||||
- galera_upgrade | bool
|
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
@ -75,7 +66,6 @@
|
|||||||
pkg: "mariadb-galera-server*"
|
pkg: "mariadb-galera-server*"
|
||||||
state: absent
|
state: absent
|
||||||
when:
|
when:
|
||||||
- galera_upgrade | bool
|
|
||||||
- ansible_pkg_mgr == 'apt'
|
- ansible_pkg_mgr == 'apt'
|
||||||
tags:
|
tags:
|
||||||
- galera-upgrade
|
- galera-upgrade
|
||||||
|
Loading…
x
Reference in New Issue
Block a user