Update role

tasks/main.yml

@@ -1,6 +1,8 @@
 ---
 - name: Weave Net setup
   block:
+    - name: Include Weave Net vars
+      include_vars: net-files.yaml
     - name: Weave Net files
       k8s:
         state: present
@@ -9,8 +11,6 @@
         resource_definition: "{{ lookup('file', item) | from_yaml }}"
       with_items:
         - "{{ weave_net_files }}"
-      when:
-        - kubernetes_network == "weave-net"
     - name: Weave Net password
       k8s:
         state: present
@@ -19,12 +19,17 @@
         resource_definition: "{{ lookup('template', item) | from_yaml }}"
       with_items:
         - weave-net-secret.yml.j2
-      when:
-        - kubernetes_network == "weave-net"
-  tags: weave
+  when:
+    - kubernetes_network == "weave-net"
+  tags:
+    - weave
+    - weave-net
+    - k8s-network
 
 - name: Weave Scope setup
   block:
+  - name: Include Weave Scope vars
+    include_vars: scope-files.yaml
   - name: namespace
     k8s:
       context: "{{ my_context }}"
@@ -88,5 +93,8 @@
       resource_definition: "{{ lookup('file', item) | from_yaml }}"
     with_items:
       - "{{ weave_scope_files }}"
-  tags: weave
-
+  when:
+    - weave_scope|bool
+  tags:
+    - weave
+    - weave-scope