Normalize tags in all places to prepare for tag fixing in future (#1739)

roles/network_plugin/calico/meta/main.yml

@@ -2,13 +2,20 @@
 dependencies:
   - role: download
     file: "{{ downloads.calico_cni }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.calico_node }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.calicoctl }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.hyperkube }}"
-    tags: download
+    tags:
+      - download

roles/network_plugin/calico/tasks/main.yml

@@ -54,7 +54,9 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
-  tags: [hyperkube, upgrade]
+  tags:
+    - hyperkube
+    - upgrade
 
 - name: Calico | Copy cni plugins from calico/cni container
   command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp -a /opt/cni/bin/* /cnibindir/'"
@@ -64,7 +66,9 @@
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
   when: overwrite_hyperkube_cni|bool
-  tags: [hyperkube, upgrade]
+  tags:
+    - hyperkube
+    - upgrade
 
 - name: Calico | Set cni directory permissions
   file:

roles/network_plugin/canal/meta/main.yml

@@ -2,16 +2,25 @@
 dependencies:
   - role: download
     file: "{{ downloads.flannel }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.calico_node }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.calicoctl }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.calico_cni }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.calico_policy }}"
-    tags: download
+    tags:
+      - download

roles/network_plugin/canal/tasks/main.yml

@@ -56,7 +56,9 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
-  tags: [hyperkube, upgrade]
+  tags:
+    - hyperkube
+    - upgrade
 
 - name: Canal | Copy cni plugins from calico/cni
   command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} sh -c 'cp -a /opt/cni/bin/* /cnibindir/'"
@@ -65,7 +67,9 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
-  tags: [hyperkube, upgrade]
+  tags:
+    - hyperkube
+    - upgrade
 
 - name: Canal | Set cni directory permissions
   file:

roles/network_plugin/flannel/meta/main.yml

@@ -2,7 +2,10 @@
 dependencies:
   - role: download
     file: "{{ downloads.flannel }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.flannel_cni }}"
-    tags: download
+    tags:
+      - download

roles/network_plugin/meta/main.yml

@@ -2,15 +2,23 @@
 dependencies:
   - role: network_plugin/calico
     when: kube_network_plugin == 'calico'
-    tags: calico
+    tags:
+      - calico
+
   - role: network_plugin/flannel
     when: kube_network_plugin == 'flannel'
-    tags: flannel
+    tags:
+      - flannel
+
   - role: network_plugin/weave
     when: kube_network_plugin == 'weave'
-    tags: weave
+    tags:
+      - weave
+
   - role: network_plugin/canal
     when: kube_network_plugin == 'canal'
-    tags: canal
+    tags:
+      - canal
+
   - role: network_plugin/cloud
     when: kube_network_plugin == 'cloud'

roles/network_plugin/weave/meta/main.yml

@@ -2,7 +2,10 @@
 dependencies:
   - role: download
     file: "{{ downloads.weave_kube }}"
-    tags: download
+    tags:
+      - download
+
   - role: download
     file: "{{ downloads.weave_npc }}"
-    tags: download
+    tags:
+      - download

roles/network_plugin/weave/tasks/main.yml

@@ -9,7 +9,9 @@
   retries: 4
   delay: "{{ retry_stagger | random + 3 }}"
   changed_when: false
-  tags: [hyperkube, upgrade]
+  tags:
+    - hyperkube
+    - upgrade
 
 - name: Weave | Create weave-net manifest
   template:

roles/network_plugin/weave/tasks/seed.yml

@@ -4,28 +4,32 @@
     seed: '{% for host in groups["k8s-cluster"] %}{{ hostvars[host]["ansible_default_ipv4"]["macaddress"] }}{% if not loop.last %},{% endif %}{% endfor %}'
   when: "weave_seed == 'uninitialized'"
   run_once: true
-  tags: confweave
+  tags:
+    - confweave
 
 - name: Weave seed | Set seed if not first time
   set_fact:
     seed: '{{ weave_seed }}'
   when: "weave_seed != 'uninitialized'"
   run_once: true
-  tags: confweave
+  tags:
+    - confweave
 
 - name: Weave seed | Set peers if fist time
   set_fact:
     peers: '{{ weave_ip_current_cluster }}'
   when: "weave_peers == 'uninitialized'"
   run_once: true
-  tags: confweave
+  tags:
+    - confweave
 
 - name: Weave seed | Set peers if existing peers
   set_fact:
     peers: '{{ weave_peers }}{% for ip in weave_ip_current_cluster.split(" ") %}{% if ip not in weave_peers.split(" ") %} {{ ip }}{% endif %}{% endfor %}'
   when: "weave_peers != 'uninitialized'"
   run_once: true
-  tags: confweave
+  tags:
+    - confweave
 
 - name: Weave seed | Save seed
   lineinfile:
@@ -36,7 +40,8 @@
   become: no
   delegate_to: 127.0.0.1
   run_once: true
-  tags: confweave
+  tags:
+    - confweave
 
 - name: Weave seed | Save peers
   lineinfile:
@@ -47,4 +52,5 @@
   become: no
   delegate_to: 127.0.0.1
   run_once: true
-  tags: confweave
+  tags:
+    - confweave