Merge lp:~lamont/maas/bug-1636251-1.9 into lp:maas/1.9

[LaMont Jones]

The domain for the node needs to be listed first in the search directive in resolv.conf.

The domain for the node needs to be listed first in the search directive in resolv.conf.

[Mike Pontillo (mpontillo)]

Fix looks good, but I'm not quite sure how the test tests this specific fix?

review: Needs Information

[Mike Pontillo (mpontillo)]

Ah, I didn't realize the first argument to the NodeGroup factory was the domain name. Never mind on part of my comment, but I still wonder where in the test we make sure the node's domain comes first?

[LaMont Jones (lamont)]

> Ah, I didn't realize the first argument to the NodeGroup factory was the
> domain name. Never mind on part of my comment, but I still wonder where in the
> test we make sure the node's domain comes first?

collectDNSConfig in the test file generates the expected config, and has been changed to always put the domain portion of the fqdn of the node in ahead of the sorted dns search list (and pruning dupes as it goes.)

[Mike Pontillo (mpontillo)]

Got it. Sounds good; thanks!

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-07-17 00:28:01 +0000
+++ docs/changelog.rst	2016-10-24 23:42:39 +0000
@@ -5,6 +5,8 @@
 1.9.5
 =====
 
+LP: #1636251    [1.9] resolv.conf search path doesn't match the domain for the host.
+
 LP: #1603590    [1.9] MAAS does not allow link-local address for default gateway on ipv6 subnet.
 
 1.9.4
 
=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2015-11-09 19:39:43 +0000
+++ src/maasserver/preseed_network.py	2016-10-24 23:42:39 +0000
@@ -58,10 +58,15 @@
         # Order the network_config where dependencies come first.
         self._order_config_dependency()
 
+        domain_name = self.node.fqdn.split('.', 1)[1]
+        search_list = [domain_name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != domain_name]
         self.network_config.append({
             "type": "nameserver",
             "address": get_dns_server_address(nodegroup=self.node.nodegroup),
-            "search": sorted(get_dns_search_paths()),
+            "search": search_list,
         })
 
         network_config = {
 
=== modified file 'src/maasserver/tests/test_preseed_network.py'
--- src/maasserver/tests/test_preseed_network.py	2015-11-09 19:39:43 +0000
+++ src/maasserver/tests/test_preseed_network.py	2016-10-24 23:42:39 +0000
@@ -213,7 +213,11 @@
     def collectDNSConfig(self, node):
         config = "- type: nameserver\n  address: %s\n  search:\n" % (
             get_dns_server_address(nodegroup=node.nodegroup))
-        dns_searches = sorted(get_dns_search_paths())
+        domain_name = node.fqdn.split('.', 1)[1]
+        dns_searches = [domain_name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != domain_name]
         for dns_name in dns_searches:
             config += "   - %s\n" % dns_name
         return config
@@ -222,8 +226,14 @@
 class TestSimpleNetworkLayout(MAASServerTestCase, AssertNetworkConfigMixin):
 
     def test__renders_expected_output(self):
+        factory.make_NodeGroup(
+            name=factory.make_name('aaa'))
+        nodegroup = factory.make_NodeGroup(
+            name=factory.make_name('bbb'))
+        factory.make_NodeGroup(
+            name=factory.make_name('ccc'))
         node = factory.make_Node_with_Interface_on_Subnet(
-            interface_count=2)
+            interface_count=2, nodegroup=nodegroup)
         for iface in node.interface_set.filter(enabled=True):
             factory.make_StaticIPAddress(
                 interface=iface,