From b6b1bd5e35ec046ad8db177f2c3fbfdc6211798c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Thu, 5 Jan 2017 15:31:57 +0000
Subject: [PATCH] Bring consistency to tags

If we filtered this role by running only on tags config/install,
the task(s) changed here wouldn't be properly targeted.

Under ubuntu the galera server would run by default if only doing the
install tag, where it should stay disabled.

Change-Id: Ic23fad68b9ee383559695ab73d6447735f445f51
(cherry picked from commit 2861c4df362bb64a21b51913847545e1861f8368)
---
 tasks/galera_install_apt.yml |  4 +---
 tasks/galera_install_yum.yml |  4 ++--
 tasks/main.yml               | 13 +++++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tasks/galera_install_apt.yml b/tasks/galera_install_apt.yml
index 452bc7e5..cf2ff6d8 100644
--- a/tasks/galera_install_apt.yml
+++ b/tasks/galera_install_apt.yml
@@ -113,8 +113,6 @@
     dest: "/usr/sbin/policy-rc.d"
     mode: "0755"
     backup: yes
-  tags:
-    - galera-config
 
 #TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
 #when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
@@ -178,4 +176,4 @@
     path: "/usr/sbin/policy-rc.d"
     state: absent
   tags:
-    - galera-config
+    - galera_server-config
diff --git a/tasks/galera_install_yum.yml b/tasks/galera_install_yum.yml
index 1573c89e..869b1028 100644
--- a/tasks/galera_install_yum.yml
+++ b/tasks/galera_install_yum.yml
@@ -25,8 +25,6 @@
     - { src: "/usr/lib64/galera", path: "/usr/lib/galera", state: "link", force: true }
     - { src: "/etc/mysql/conf.d", path: "/etc/my.cnf.d", state: "link", force: true }
     - { src: "/etc/mysql/my.cnf", path: "/etc/my.cnf", state: "link", force: true }
-  tags:
-    - galera-config
 
 - name: Add galera gpg-keys
   rpm_key:
@@ -131,6 +129,7 @@
     name: "mysql"
     enabled: "yes"
   tags:
+    - galera_server-config
     - galera-enable
 
 # NOTE(cloudnull): This is an idempotent shell task is it will only run once
@@ -157,5 +156,6 @@
   args:
     creates: /etc/mysql/rhel_configured
   tags:
+    - galera_server-config
     - galera-rhel-config
     - skip_ansible_lint
diff --git a/tasks/main.yml b/tasks/main.yml
index f380d76b..0d76afd2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -36,11 +36,22 @@
     - always
 
 - include: galera_upgrade_check.yml
+  tags: galera_server-upgrade
+
 - include: galera_cluster_state.yml
+  tags: galera_server-config
+
 - include: galera_pre_install.yml
+  tags: galera_server-install
+
 - include: galera_install.yml
+  tags: galera_server-install
+
 - include: galera_post_install.yml
+  tags: galera_server-config
+
 - include: galera_bootstrap.yml
+  tags: galera_server-config
 
 - name: Flush handlers
   meta: flush_handlers
@@ -49,6 +60,8 @@
   vars:
     num_retries: 10
     wait_delay: 3
+  tags: galera_server-config
 
 - include: galera_setup.yml
   when: inventory_hostname == galera_server_bootstrap_node
+  tags: galera_server-config