Browse Source

Add new var skip_dnsmasq_k8s

If skip_dnsmasq is set, it will still not set up dnsmasq
k8s pod. This enables independent setup of resolvconf section
before kubelet is up.
pull/568/head
Matthew Mosesohn 8 years ago
parent
commit
2778ac61a4
2 changed files with 8 additions and 2 deletions
  1. 8
      roles/dnsmasq/defaults/main.yml
  2. 2
      roles/dnsmasq/tasks/main.yml

8
roles/dnsmasq/defaults/main.yml

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

2
roles/dnsmasq/tasks/main.yml

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