From 7e6d7caf4bfb225e0f3f1cc8bcde6ece44854690 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Mon, 21 Mar 2016 11:37:35 +0100
Subject: [PATCH] Dnsmasq runs on all nodes
---
cluster.yml | 4 ++--
roles/dnsmasq/tasks/main.yml | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cluster.yml b/cluster.yml
index 5571055de..832afbb84 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -13,6 +13,6 @@
roles:
- { role: kubernetes/master, tags: master }
-- hosts: kube-master[0]
+- hosts: k8s-cluster
roles:
- - { role: dnsmasq, tags: dnsmasq }
\ No newline at end of file
+ - { role: dnsmasq, tags: dnsmasq }
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index e204f22b7..020ef3b86 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -37,10 +37,7 @@
- {file: dnsmasq-ds.yml, type: ds}
- {file: dnsmasq-svc.yml, type: svc}
register: manifests
-
-# - name: Start resources
-# command: create -f /etc/kubernetes/{{item.item.file}} --namespace=kube-system
-# ignore_errors: yes
+ when: inventory_hostname == groups['kube-master'][0]
- name: Start Resources
kube:
@@ -51,14 +48,15 @@
filename: /etc/kubernetes/{{item.item.file}}
state: "{{item.changed | ternary('latest','present') }}"
with_items: manifests.results
-
-
+ when: inventory_hostname == groups['kube-master'][0]
- name: Check for dnsmasq port (pulling image and running container)
wait_for:
host: "{{dns_server}}"
port: 53
delay: 5
+ when: inventory_hostname == groups['kube-master'][0]
+
- name: check resolvconf
stat: path=/etc/resolvconf/resolv.conf.d/head
--
GitLab