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

[LaMont Jones]

Make sure that the host's domain is listed first in the search list, so that it knows its fqdn.

Make sure that the host's domain is listed first in the search list, so that it knows its fqdn.

[LaMont Jones (lamont)]

Trivial backport

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-08-22 23:21:36 +0000
+++ docs/changelog.rst	2016-10-25 20:24:42 +0000
@@ -8,6 +8,8 @@
 Issues fixed in this release
 ----------------------------
 
+LP: #1636251    resolv.conf search path doesn't match the domain for the host.
+
 LP: #1615686    Single-IP dynamic ranges resulted in internal errors.
 
 2.0.0

=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2016-07-15 02:18:08 +0000
+++ src/maasserver/preseed_network.py	2016-10-25 20:24:42 +0000
@@ -47,10 +47,14 @@
         # Order the network_config where dependencies come first.
         self._order_config_dependency()
 
+        search_list = [self.node.domain.name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != self.node.domain.name]
         self.network_config.append({
             "type": "nameserver",
             "address": self.dns_servers,
-            "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	2016-07-15 02:18:08 +0000
+++ src/maasserver/tests/test_preseed_network.py	2016-10-25 20:24:42 +0000
@@ -201,7 +201,11 @@
     def collectDNSConfig(self, node):
         config = "- type: nameserver\n  address: %s\n  search:\n" % (
             repr(node.get_default_dns_servers()))
-        dns_searches = sorted(get_dns_search_paths())
+        domain_name = node.domain.name
+        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
@@ -210,8 +214,13 @@
 class TestSimpleNetworkLayout(MAASServerTestCase, AssertNetworkConfigMixin):
 
     def test__renders_expected_output(self):
+        # Force it to have a domain name in the middle of two others.  This
+        # will confirm that sorting is working correctly.
+        factory.make_Domain('aaa')
+        domain = factory.make_Domain('bbb')
+        factory.make_Domain('ccc')
         node = factory.make_Node_with_Interface_on_Subnet(
-            interface_count=2)
+            interface_count=2, domain=domain)
         for iface in node.interface_set.filter(enabled=True):
             factory.make_StaticIPAddress(
                 interface=iface,