Merge pull request #568 from kubespray/issue/452

Add new var skip_dnsmasq_k8s

roles/dnsmasq/defaults/main.yml

@@ -17,3 +17,9 @@ dnsmasq_version: 2.72
 # Images
 dnsmasq_image_repo: "andyshinn/dnsmasq"
 dnsmasq_image_tag: "{{ dnsmasq_version }}"
+
+# Skip dnsmasq setup
+skip_dnsmasq: false
+
+# Skip setting up dnsmasq daemonset
+skip_dnsmasq_k8s: "{{ skip_dnsmasq }}"

roles/dnsmasq/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
 - include: dnsmasq.yml
-  when: "{{ not skip_dnsmasq|bool }}"
+  when: "{{ not skip_dnsmasq_k8s|bool }}"
 
 - include: resolvconf.yml