Merge pull request #1023 from mattymo/fix_dnsmasq_cleanup

Clean up dnsmasq purge task

roles/dnsmasq/tasks/main.yml

@@ -57,17 +57,13 @@
   when: inventory_hostname == groups['kube-master'][0]
 
 #FIXME: remove manifests.changed condition if kubernetes/features#124 is implemented
-- name: Delete existing dnsmasq daemonset 
+- name: Delete existing dnsmasq daemonset
   kube:
     name: dnsmasq
     namespace: "{{system_namespace}}"
     kubectl: "{{bin_dir}}/kubectl"
-    resource: "{{item.item.type}}"
-    filename: "{{kube_config_dir}}/{{item.item.file}}"
-    kubectl: "{{ bin_dir }}/kubectl"
-    filename: "{{ kube_config_dir }}/weave-net.yml"
     resource: "ds"
-    namespace: "{{system_namespace}}"
+    filename: "{{kube_config_dir}}/{{item.item.file}}"
     state: absent
   with_items: "{{ manifests.results }}"
   when: inventory_hostname == groups['kube-master'][0] and item.item.type == "ds" and (manifests.changed or dnsmasq_config.changed)