fixup upgrades for canal and weave

roles/kubernetes-apps/network_plugin/canal/tasks/main.yaml

@@ -13,7 +13,7 @@
   kube:
     name: "canal-node"
     kubectl: "{{ bin_dir }}/kubectl"
-    filename: "{{ kube_config_dir }}/canal-node.yml"
+    filename: "{{ kube_config_dir }}/canal-node.yaml"
     resource: "ds"
     namespace: "{{system_namespace}}"
     state: absent

roles/network_plugin/weave/tasks/pre-upgrade.yml

@@ -37,3 +37,5 @@
 
 - name: Weave pre-upgrade | Purge legacy weave docker containers
   shell: "docker ps -af 'name=^/weave.*' -q | xargs --no-run-if-empty docker rm -f"
+  retries: 3
+  failed_when: false