From 8d9771a094743209c318ced1486c8f785fea8345 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 8 Nov 2017 12:02:46 +0100
Subject: [PATCH] ansible-playbooks/general#72 All includes are now
 include_tasks and they always have a tag associated

---
 tasks/main.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index e52ba7b..e85c391 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,31 +3,40 @@
 
 - name: "NetData Role"
   set_fact: role_netdata_started=true
-  tags: always
+  tags: 'always'
 
 - block:
 
-  - import_tasks: prepare.yml
+  - include_tasks: prepare.yml
+    tags: 'always'
 
-  - import_tasks: install.yml
+  - include_tasks: install.yml
+    tags: 'always'
 
-  - import_tasks: configure.yml
+  - include_tasks: configure.yml
+    tags: 'always'
 
-  - import_tasks: apache.yml
+  - include_tasks: apache.yml
     when: groups['webserver'] is defined and inventory_hostname in groups['webserver']
+    tags: 'always'
 
-  - import_tasks: elasticsearch.yml
+  - include_tasks: elasticsearch.yml
     when: groups['logserver'] is defined and inventory_hostname in groups['logserver']
+    tags: 'always'
 
-  - import_tasks: haproxy.yml
+  - include_tasks: haproxy.yml
     when: groups['proxyserver'] is defined and inventory_hostname in groups['proxyserver']
+    tags: 'always'
 
-  - import_tasks: mysql.yml
+  - include_tasks: mysql.yml
     when: groups['dbserver-mysql'] is defined and inventory_hostname in groups['dbserver-mysql']
+    tags: 'always'
 
-  - import_tasks: silent.yml
+  - include_tasks: silent.yml
+    tags: 'always'
 
-  - import_tasks: varnish.yml
+  - include_tasks: varnish.yml
     when: groups['varnishserver'] is defined and inventory_hostname in groups['varnishserver']
+    tags: 'always'
 
   when: '"netdata" not in excluded_roles'
-- 
GitLab