From 1418fb394bb42b1fc7fe6f30b91d85b57e5eaddf Mon Sep 17 00:00:00 2001
From: Artem Panchenko <apanchenko@mirantis.com>
Date: Fri, 20 Jan 2017 12:56:26 +0200
Subject: [PATCH] Explicitly set config path for DNSMasq

When DNSMasq is configured to read its settings
from a folder ('-7' or '--conf-dir' option) it only
checks that the directory exists and doesn't fail if
it's empty. It could lead to a situation when DNSMasq
is running and handles requests, but not properly
configured, so some of queries can't be resolved.
---
 roles/dnsmasq/templates/dnsmasq-ds.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/dnsmasq/templates/dnsmasq-ds.yml b/roles/dnsmasq/templates/dnsmasq-ds.yml
index 08ff70bff..adcbbeacb 100644
--- a/roles/dnsmasq/templates/dnsmasq-ds.yml
+++ b/roles/dnsmasq/templates/dnsmasq-ds.yml
@@ -20,8 +20,8 @@ spec:
             - dnsmasq
           args:
             - -k
-            - "-7"
-            - /etc/dnsmasq.d
+            - -C
+            - /etc/dnsmasq.d/01-kube-dns.conf
           securityContext:
             capabilities:
               add:
-- 
GitLab