From 7d950ade99c7f8ebd46609342e3ec71f54ef2065 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 26 Apr 2018 16:31:06 +0300
Subject: [PATCH] roles: Remove unreachable "packages" tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After reörganizing for dynamic includes these tags will never be reached
because the children of dynamic includes do not inherit tags from their
parents as they did with static imports.
---
 roles/common/tasks/firewall_Debian.yml | 4 +---
 roles/common/tasks/firewall_Ubuntu.yml | 4 +---
 roles/common/tasks/ntp.yml             | 2 --
 roles/nginx/tasks/letsencrypt.yml      | 6 ------
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/roles/common/tasks/firewall_Debian.yml b/roles/common/tasks/firewall_Debian.yml
index 4f4580a..b42a65f 100644
--- a/roles/common/tasks/firewall_Debian.yml
+++ b/roles/common/tasks/firewall_Debian.yml
@@ -5,9 +5,7 @@
   loop:
     - firewalld
     - tidy
-  tags:
-    - packages
-    - firewall
+  tags: firewall
 
 - name: Copy firewalld public zone file
   when: ansible_distribution_major_version is version_compare('8', '>=')
diff --git a/roles/common/tasks/firewall_Ubuntu.yml b/roles/common/tasks/firewall_Ubuntu.yml
index f2ddd07..7a468eb 100644
--- a/roles/common/tasks/firewall_Ubuntu.yml
+++ b/roles/common/tasks/firewall_Ubuntu.yml
@@ -5,9 +5,7 @@
   loop:
     - firewalld
     - tidy
-  tags:
-    - packages
-    - firewall
+  tags: firewall
 
 - name: Copy firewalld public zone file
   when: ansible_distribution_version is version_compare('15.04', '>=')
diff --git a/roles/common/tasks/ntp.yml b/roles/common/tasks/ntp.yml
index ab2abc0..97ee8d4 100644
--- a/roles/common/tasks/ntp.yml
+++ b/roles/common/tasks/ntp.yml
@@ -15,11 +15,9 @@
 - name: Uninstall ntp on modern Ubuntu/Debian
   apt: name=ntp state=absent update_cache=yes
   when: ansible_service_mgr == 'systemd'
-  tags: packages
 
 - name: Install ntp on old Ubuntu/Debian
   apt: name=ntp state=present update_cache=yes
   when: ansible_service_mgr != 'systemd'
-  tags: packages
 
 # vim: set ts=2 sw=2:
diff --git a/roles/nginx/tasks/letsencrypt.yml b/roles/nginx/tasks/letsencrypt.yml
index 0e0c8e1..09fa536 100644
--- a/roles/nginx/tasks/letsencrypt.yml
+++ b/roles/nginx/tasks/letsencrypt.yml
@@ -17,20 +17,14 @@
   - name: Install certbot dependencies (Ubuntu 16.04)
     when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==')
     apt: name={{ letsencrypt_deps_ubuntu_xenial }} state=present update_cache=yes
-    tags:
-      - packages
 
   - name: Install certbot dependencies (Ubuntu 18.04)
     when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('18.04', '==')
     apt: name={{ letsencrypt_deps_ubuntu_bionic }} state=present update_cache=yes
-    tags:
-      - packages
 
   - name: Install certbot dependencies (Debian 9)
     when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==')
     apt: name={{ letsencrypt_deps_debian_stretch }} state=present update_cache=yes
-    tags:
-      - packages
   tags: letsencrypt
 
 # vim: set ts=2 sw=2: