From 9237d736d85ac810985a6e785a3bdd5d7a7961ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20M=C3=BCller?= <thorsten.mueller@uni-wuppertal.de>
Date: Thu, 24 Jun 2021 14:17:16 +0200
Subject: [PATCH] tags

---
 play.yml                   | 20 ++++++++++++++------
 roles/slurm/tasks/main.yml |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/play.yml b/play.yml
index 7e48ee4..a131618 100644
--- a/play.yml
+++ b/play.yml
@@ -65,15 +65,20 @@
     tags: docker
 
   - name: "get facts from existing cobald instance (i.e. hostname)"
-    import_role:
+    include_role:
       name: cobald
       tasks_from: facts
+      apply:
+        tags: slurm, cobald, slurm-config
+    tags: slurm, cobald, slurm-config
     vars:
       container_name: cobald
-    tags: [ slurm, cobald ]
 
   - name: "setup slurm test environment in docker containers"
-    import_role: name=slurm
+    include_role:
+      name: slurm
+      apply:
+        tags: slurm
     vars:
       slurm_user: slurm # or root
       slurm_user_accounts:
@@ -95,13 +100,16 @@
         # the network name in host environment. We should run our own dns...
       docker_network: slurm
     when: '"slurm" in group_names'
-    tags: slurm
+    tags: slurm, slurm-config
 
   - name: "install cobald"
-    import_role: name=cobald
+    include_role:
+      name: cobald
+      apply:
+        tags: cobald
     vars:
       cobald_slurm: True
       container_name: cobald
       # docker_network: slurm # overriden by vars/slurm.yml
     when: '"cobald" in group_names'
-    tags: cobald
+    tags: cobald, influxdb
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index 81a6873..7f8def4 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -71,7 +71,7 @@
     - name: "{{slurm_prefix+'-submit1'}}"
     alloc_nodes: "{{ slurm_alloc_nodes_default + extra_nodes | default([])}}"
   notify: reconfigure slurm
-  tags: [ slurm-config ]
+  tags: slurm-config
 
 - name: "create docker network to make service discovery work"
   docker_network:
@@ -110,7 +110,7 @@
   loop: "{{ slurm_nodes_all }}"
   loop_control:
     label: "{{slurm_prefix}}-{{ item.machine }}"
-  tags: [ slurm-config ]
+  tags: slurm-config
 
 - name: export facts about slurm cluster to be used by other modules
   set_fact: