C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1023 from mattymo/fix_dnsmasq_cleanup

Browse source 
Clean up dnsmasq purge task
This commit is contained in:
Matthew Mosesohn 2017-02-13 19:50:01 +03:00 committed by GitHub
commit 192fc13ff2
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/dnsmasq/tasks/main.yml
View file

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