From 9e6e9abee753da691ee1a3e4564b5b04c227931b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Fri, 6 Jan 2017 13:49:27 +0000
Subject: [PATCH] Bring consistency to tags

Some tags were not applied on the highest level and forced duplication.
We apply here our practices to have role_name-(config|install).

Change-Id: I0e77f74561877a94dd222c4c71c7bcf7f095a649
Signed-off-by: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
---
 tasks/haproxy_install.yml      |  2 +-
 tasks/haproxy_post_install.yml | 14 ++++++--------
 tasks/main.yml                 |  8 ++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/tasks/haproxy_install.yml b/tasks/haproxy_install.yml
index acc1695..09921d1 100644
--- a/tasks/haproxy_install.yml
+++ b/tasks/haproxy_install.yml
@@ -34,4 +34,4 @@
     - { path: "/etc/haproxy" }
     - { path: "/etc/haproxy/conf.d" }
   tags:
-    - haproxy-config
+    - haproxy_server-config
diff --git a/tasks/haproxy_post_install.yml b/tasks/haproxy_post_install.yml
index 6b16301..7accd81 100644
--- a/tasks/haproxy_post_install.yml
+++ b/tasks/haproxy_post_install.yml
@@ -21,8 +21,7 @@
     state: present
   when: haproxy_bind_on_non_local | bool
   tags:
-    - haproxy-base-config
-    - haproxy-config
+    - haproxy-non-local-bind-config
 
 - name: Drop base haproxy config
   template:
@@ -31,7 +30,6 @@
   notify: Restart haproxy
   tags:
     - haproxy-base-config
-    - haproxy-config
 
 - name: Drop haproxy logging config
   copy:
@@ -39,10 +37,11 @@
     dest: "/etc/rsyslog.d/99-haproxy-local-logging.conf"
   notify: Restart rsyslog
   tags:
-    - haproxy-base-config
-    - haproxy-config
+    - haproxy-logging-config
 
 - include: haproxy_service_config.yml
+  tags:
+    - haproxy-service-config
 
 - name: Regenerate haproxy configuration
   assemble:
@@ -50,12 +49,11 @@
     dest: "/etc/haproxy/haproxy.cfg"
   notify: Restart haproxy
   tags:
-    - haproxy-base-config
-    - haproxy-config
+    - haproxy-general-config
 
 - name: Enable haproxy services
   service:
     name: "haproxy"
     enabled: "yes"
   tags:
-    - haproxy-config
+    - haproxy-enable-service-config
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 37ba2a5..31ee6d1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,10 +24,18 @@
     - always
 
 - include: haproxy_pre_install.yml
+  tags:
+    - haproxy_server-install
 
 - include: haproxy_install.yml
+  tags:
+    - haproxy_server-install
 
 - include: haproxy_ssl.yml
   when: haproxy_ssl | bool
+  tags:
+    - haproxy_server-config
 
 - include: haproxy_post_install.yml
+  tags:
+    - haproxy_server-config