From c49a94deaddc52a96e504d1306a93cb3ff887eb4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Fri, 13 Jan 2017 14:24:20 +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) [1].

[1]: http://docs.openstack.org/developer/openstack-ansible/developer-docs/contribute.html#ansible-style-guide

Change-Id: Ib44b2aa978df1c763d8c619a37d1025c3a90e6c1
---
 tasks/main.yml              | 12 ++++++++++++
 tasks/repo_cacher.yml       | 14 ++++++++++++++
 tasks/repo_post_install.yml | 12 ++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index 0efd934..66be614 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,7 +25,13 @@
     - always
 
 - include: repo_pre_install.yml
+  tags:
+    - repo_server-install
+
 - include: repo_install.yml
+  tags:
+    - repo_server-install
+
 - include: repo_post_install.yml
 
 - include: repo_cacher.yml
@@ -33,12 +39,18 @@
   when: repo_pkg_cache_enabled | bool
 
 - include: repo_key_populate.yml
+  tags:
+    - repo_server-config
 
 - include: repo_key_distribute.yml
   when: groups.repo_all|length > 1
+  tags:
+    - repo_server-config
 
 - include: repo_sync_manager.yml
   when: inventory_hostname == groups['repo_all'][0]
+  tags:
+    - repo_server-config
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/tasks/repo_cacher.yml b/tasks/repo_cacher.yml
index 58644f8..2e08b64 100644
--- a/tasks/repo_cacher.yml
+++ b/tasks/repo_cacher.yml
@@ -26,6 +26,8 @@
   when:
     - ansible_pkg_mgr == 'yum'
     - repo_pkg_cache_enabled | bool
+  tags:
+    - repo_server-install
 
 - name: Install repo caching server packages (apt)
   apt:
@@ -39,6 +41,8 @@
   when:
     - ansible_pkg_mgr == 'apt'
     - repo_pkg_cache_enabled | bool
+  tags:
+    - repo_server-install
 
 - name: Create cache directory
   file:
@@ -47,11 +51,15 @@
     owner: "{{ repo_pkg_cache_owner }}"
     group: "{{ repo_service_group_name }}"
     mode: "02775"
+  tags:
+    - repo_server-install
 
 - name: Stat the cache path
   stat:
     path: /var/cache/apt-cacher-ng
   register: acs
+  tags:
+    - repo_server-install
 
 - name: Remove cacher directory if its a directory
   file:
@@ -59,12 +67,16 @@
     state: "absent"
   when:
     - acs.stat.isdir is defined and acs.stat.isdir
+  tags:
+    - repo_server-install
 
 - name: Link cacher to the repo path
   file:
     src: "{{ repo_service_home_folder }}/repo/pkg-cache"
     dest: "/var/cache/apt-cacher-ng"
     state: "link"
+  tags:
+    - repo_server-install
 
 - name: Drop acng.conf
   template:
@@ -72,3 +84,5 @@
     dest: "/etc/apt-cacher-ng/acng.conf"
   notify:
     - reload acng
+  tags:
+    - repo_server-config
diff --git a/tasks/repo_post_install.yml b/tasks/repo_post_install.yml
index 9e980fa..d51f85d 100644
--- a/tasks/repo_post_install.yml
+++ b/tasks/repo_post_install.yml
@@ -20,6 +20,7 @@
     system: "yes"
   tags:
     - pkg-repo-group
+    - repo_server-install
 
 - name: Remove old key file(s) if found
   file:
@@ -33,6 +34,7 @@
   tags:
     - repo-key
     - repo-key-create
+    - repo_server-install
 
 - name: Create the nginx system user
   user:
@@ -48,6 +50,7 @@
     - pkg-repo-user
     - repo-key
     - repo-key-create
+    - repo_server-install
 
 - name: File and directory setup (non-root user)
   file:
@@ -77,6 +80,7 @@
       mode: "0775"
   tags:
     - pkg-repo-dirs
+    - repo_server-install
 
 - name: Drop repo pre/post command script
   template:
@@ -87,6 +91,7 @@
     group: "root"
   tags:
     - pkg-repo-config
+    - repo_server-install
 
 - name: Check if the git folder exists already
   stat:
@@ -94,6 +99,7 @@
   register: _git_folder
   tags:
     - pkg-repo-dirs
+    - repo_server-install
 
 - name: Git service data folder setup
   file:
@@ -104,6 +110,7 @@
     recurse: true
   tags:
     - pkg-repo-dirs
+    - repo_server-install
 
 - name: File and directory setup (root user)
   file:
@@ -127,6 +134,8 @@
     - path: "/etc/nginx/sites-enabled"
       state: "directory"
       mode: "0644"
+  tags:
+    - repo_server-install
 
 - name: Drop NGINX configuration files
   template:
@@ -141,6 +150,7 @@
   tags:
     - pkg-repo-nginx
     - pkg-repo-config
+    - repo_server-config
 
 - name: Enable openstack-slushee site
   file:
@@ -152,6 +162,7 @@
   tags:
     - pkg-repo-nginx
     - pkg-repo-config
+    - repo_server-config
 
 - name: Place git daemon systemd init script
   template:
@@ -169,3 +180,4 @@
     - reload git socket
   tags:
     - git-daemon-init
+    - repo_server-config