From b5be335db3eb3a8da9db3b608fc4e80db5638aa1 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Mon, 13 Feb 2017 17:30:15 +0300 Subject: [PATCH] Clean up dnsmasq purge task --- roles/dnsmasq/tasks/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml index a174b08c8..933bf19cf 100644 --- a/roles/dnsmasq/tasks/main.yml +++ b/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)