From e0f460d9b5c18c8bbf640277de63b39ca60ac8a6 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Wed, 30 Dec 2015 13:21:48 +0100
Subject: [PATCH] copy template dnsmasq pod and remove handlers
---
roles/dnsmasq/handlers/main.yml | 3 ---
roles/dnsmasq/tasks/main.yml | 15 ++++++++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
delete mode 100644 roles/dnsmasq/handlers/main.yml
diff --git a/roles/dnsmasq/handlers/main.yml b/roles/dnsmasq/handlers/main.yml
deleted file mode 100644
index 48b313727..000000000
--- a/roles/dnsmasq/handlers/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: restart dnsmasq
- command: systemctl restart dnsmasq
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index d044c0885..8d9922bb7 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -28,7 +28,6 @@
- '^127\.0\.0\.1(\s+){{ inventory_hostname }}.*'
- '^::1(\s+){{ inventory_hostname }}.*'
-
- name: ensure dnsmasq.d directory exists
file:
path: /etc/dnsmasq.d
@@ -41,10 +40,20 @@
dest: /etc/dnsmasq.d/01-kube-dns.conf
mode: 755
backup: yes
- notify:
- - restart dnsmasq
when: inventory_hostname in groups['kube-master']
+- name: create dnsmasq pod template
+ template: src=dnsmasq-pod.yml dest=/etc/kubernetes/manifests/dnsmasq-pod.manifest
+ when: inventory_hostname in groups['kube-master']
+
+- name: Check for dnsmasq port
+ wait_for:
+ port: 53
+ delay: 5
+ timeout: 100
+ when: inventory_hostname in groups['kube-master']
+
+
- name: update resolv.conf with new DNS setup
template:
src: resolv.conf.j2
--
GitLab