From 1f056e32c7ecaf54de206b1bf11e19673a7dd362 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Thu, 20 Oct 2016 09:55:58 -0700
Subject: [PATCH] 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
---
 tasks/galera_upgrade_post.yml |  4 ----
 tasks/galera_upgrade_pre.yml  | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/tasks/galera_upgrade_post.yml b/tasks/galera_upgrade_post.yml
index 28a3e1b4..97b23b43 100644
--- a/tasks/galera_upgrade_post.yml
+++ b/tasks/galera_upgrade_post.yml
@@ -28,8 +28,6 @@
     done
     echo "Service failed to start"
     exit 1
-  when:
-    - galera_upgrade | bool
   tags:
     - galera-upgrade
 
@@ -44,7 +42,5 @@
   until: galera_mysql_upgrade | success
   retries: 3
   delay: 10
-  when:
-    - galera_upgrade | bool
   tags:
     - galera-upgrade
diff --git a/tasks/galera_upgrade_pre.yml b/tasks/galera_upgrade_pre.yml
index 7b3ca64f..d7bc7d7d 100644
--- a/tasks/galera_upgrade_pre.yml
+++ b/tasks/galera_upgrade_pre.yml
@@ -16,8 +16,6 @@
 - name: Set fact to ignore cluster state
   set_fact:
     galera_ignore_cluster_state: true
-  when:
-    - galera_upgrade | bool
   tags:
     - galera-upgrade
 
@@ -29,8 +27,6 @@
   until: galera_restart_fall_back | success
   retries: 3
   delay: 5
-  when:
-    - galera_upgrade | bool
   tags:
     - galera-upgrade
 
@@ -38,8 +34,6 @@
   shell: |
     grep -rnil maria /etc/apt/sources.list.d/*
   register: old_sources
-  when:
-    - galera_upgrade | bool
   tags:
     - galera-upgrade
     - galera-apt-packages
@@ -49,8 +43,6 @@
     path: "{{ item }}"
     state: absent
   with_items: "{{ old_sources.stdout_lines | default([]) }}"
-  when:
-    - galera_upgrade | bool
   tags:
     - galera-upgrade
     - galera-apt-packages
@@ -64,7 +56,6 @@
   retries: 5
   delay: 2
   when:
-    - galera_upgrade | bool
     - ansible_pkg_mgr == 'apt'
   tags:
     - galera-upgrade
@@ -75,7 +66,6 @@
     pkg: "mariadb-galera-server*"
     state: absent
   when:
-    - galera_upgrade | bool
     - ansible_pkg_mgr == 'apt'
   tags:
     - galera-upgrade