Merge pull request #618 from MissionCriticalCloud/fix/dns-local-resolv

Add local domain to dnsmasq config to allow local dns resolving
MissionCriticalCloud · Feb 7, 2018 · 162effb · 162effb
2 parents a4eec2f + 8282d98
commit 162effb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/cosmic-core/systemvm/patches/centos7/opt/cosmic/router/bin/cs/dhcp_service.py b/cosmic-core/systemvm/patches/centos7/opt/cosmic/router/bin/cs/dhcp_service.py
@@ -44,6 +44,7 @@ def write_dnsmasq_global_config(self):
 
         filename = 'dnsmasq_global.conf'
         content = self.jinja_env.get_template('dnsmasq_global.conf').render(
+            domain_name=self.config.dbag_cmdline['config']['domain'],
             interfaces=interfaces
         )
 

diff --git a/cosmic-core/systemvm/patches/centos7/opt/cosmic/router/bin/cs/templates/dnsmasq_global.conf b/cosmic-core/systemvm/patches/centos7/opt/cosmic/router/bin/cs/templates/dnsmasq_global.conf
@@ -16,3 +16,5 @@ except-interface=lo
 except-interface={{ interface }}
 {% endfor %}
 bind-dynamic
+local=/{{ domain_name }}/
+domain={{ domain_name }}