Merge lp:~lamont/maas/bug-1621507 into lp:~maas-committers/maas/trunk

[LaMont Jones]

IPv6 support requires that we add "ip6=dhcp" to the kernel commandline for ephemeral kernels.

IPv6 support requires that we add "ip6=dhcp" to the kernel commandline for ephemeral kernels.

[Gavin Panella (allenap)]

I don't fully understand what's going on here. The magic token "BOOTIF" is... magic. Anyway, it seems fine.

review: Approve

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/kernel_opts.py	2016-10-28 15:38:40 +0000
@@ -13,6 +13,7 @@
 import os
 
 import curtin
+from netaddr import IPAddress
 from provisioningserver.drivers import ArchitectureRegistry
 from provisioningserver.logger import get_maas_logger
 
@@ -129,9 +130,18 @@
             "iscsi_target_ip=%s" % params.fs_host,
             "iscsi_target_port=3260",
             "iscsi_initiator=%s" % params.hostname,
-            # Read by cloud-initramfs-dyn-netconf and klibc's ipconfig
-            # in the initramfs.
-            "ip=::::%s:BOOTIF" % params.hostname,
+            # Read by cloud-initramfs-dyn-netconf initramfs-tools networking
+            # configuration in the initramfs.  Choose IPv4 or IPv6 based on the
+            # family of fs_host.  If BOOTIF is set, IPv6 config uses that
+            # exclusively.
+            (
+                "ip=::::%s:BOOTIF" % params.hostname
+                if IPAddress(params.fs_host).version == 4 else "ip=off"
+            ),
+            (
+                "ip6=dhcp"
+                if IPAddress(params.fs_host).version == 6 else "ip6=off"
+            ),
             # kernel / udev name iscsi devices with this path
             "ro root=/dev/disk/by-path/ip-%s:%s-iscsi-%s-lun-1" % (
                 params.fs_host, "3260", tname),

=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2016-06-22 17:03:02 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2016-10-28 15:38:40 +0000
@@ -43,6 +43,9 @@
     ArchitectureRegistry and call addCleanup on the testcase to make sure
     it is removed after the test completes.
     """
+    # fs_host needs to be an IP address, set it if it was not passed.
+    if 'fs_host' not in parms:
+        parms.update({'fs_host': factory.make_ip_address()})
     parms.update(
         {field: factory.make_name(field)
          for field in KernelParameters._fields
@@ -181,44 +184,95 @@
             "netcfg/choose_interface=auto",
             compose_kernel_command_line(params))
 
-    def test_xinstall_compose_kernel_command_line_inc_purpose_opts(self):
-        # The result of compose_kernel_command_line includes the purpose
-        # options for a non "xinstall" node.
-        params = self.make_kernel_parameters(purpose="xinstall")
-        cmdline = compose_kernel_command_line(params)
-        self.assertThat(
-            cmdline,
-            ContainsAll([
-                "root=/dev/disk/by-path/ip-",
-                "iscsi_initiator=",
-                "overlayroot=tmpfs",
-                "ip=::::%s:BOOTIF" % params.hostname]))
-
-    def test_commissioning_compose_kernel_command_line_inc_purpose_opts(self):
-        # The result of compose_kernel_command_line includes the purpose
-        # options for a non "commissioning" node.
-        params = self.make_kernel_parameters(purpose="commissioning")
-        cmdline = compose_kernel_command_line(params)
-        self.assertThat(
-            cmdline,
-            ContainsAll([
-                "root=/dev/disk/by-path/ip-",
-                "iscsi_initiator=",
-                "overlayroot=tmpfs",
-                "ip=::::%s:BOOTIF" % params.hostname]))
-
-    def test_enlist_compose_kernel_command_line_inc_purpose_opts(self):
-        # The result of compose_kernel_command_line includes the purpose
-        # options for a non "commissioning" node.
-        params = self.make_kernel_parameters(purpose="enlist")
-        cmdline = compose_kernel_command_line(params)
-        self.assertThat(
-            cmdline,
-            ContainsAll([
-                "root=/dev/disk/by-path/ip-",
-                "iscsi_initiator=",
-                "overlayroot=tmpfs",
-                "ip=::::%s:BOOTIF" % params.hostname]))
+    def test_xinstall_compose_kernel_command_line_inc_purpose_opts4(self):
+        # The result of compose_kernel_command_line includes the purpose
+        # options for a non "xinstall" node.
+        params = self.make_kernel_parameters(
+            purpose="xinstall", fs_host=factory.make_ipv4_address())
+        cmdline = compose_kernel_command_line(params)
+        self.assertThat(
+            cmdline,
+            ContainsAll([
+                "root=/dev/disk/by-path/ip-",
+                "iscsi_initiator=",
+                "overlayroot=tmpfs",
+                "ip6=off",
+                "ip=::::%s:BOOTIF" % params.hostname]))
+
+    def test_xinstall_compose_kernel_command_line_inc_purpose_opts6(self):
+        # The result of compose_kernel_command_line includes the purpose
+        # options for a non "xinstall" node.
+        params = self.make_kernel_parameters(
+            purpose="xinstall", fs_host=factory.make_ipv6_address())
+        cmdline = compose_kernel_command_line(params)
+        self.assertThat(
+            cmdline,
+            ContainsAll([
+                "root=/dev/disk/by-path/ip-",
+                "iscsi_initiator=",
+                "overlayroot=tmpfs",
+                "ip=off",
+                "ip6=dhcp"]))
+
+    def test_commissioning_compose_kernel_command_line_inc_purpose_opts4(self):
+        # The result of compose_kernel_command_line includes the purpose
+        # options for a non "commissioning" node.
+        params = self.make_kernel_parameters(
+            purpose="commissioning", fs_host=factory.make_ipv4_address())
+        cmdline = compose_kernel_command_line(params)
+        self.assertThat(
+            cmdline,
+            ContainsAll([
+                "root=/dev/disk/by-path/ip-",
+                "iscsi_initiator=",
+                "overlayroot=tmpfs",
+                "ip6=off",
+                "ip=::::%s:BOOTIF" % params.hostname]))
+
+    def test_commissioning_compose_kernel_command_line_inc_purpose_opts6(self):
+        # The result of compose_kernel_command_line includes the purpose
+        # options for a non "commissioning" node.
+        params = self.make_kernel_parameters(
+            purpose="commissioning", fs_host=factory.make_ipv6_address())
+        cmdline = compose_kernel_command_line(params)
+        self.assertThat(
+            cmdline,
+            ContainsAll([
+                "root=/dev/disk/by-path/ip-",
+                "iscsi_initiator=",
+                "overlayroot=tmpfs",
+                "ip=off",
+                "ip6=dhcp"]))
+
+    def test_enlist_compose_kernel_command_line_inc_purpose_opts4(self):
+        # The result of compose_kernel_command_line includes the purpose
+        # options for a non "commissioning" node.
+        params = self.make_kernel_parameters(
+            purpose="enlist", fs_host=factory.make_ipv4_address())
+        cmdline = compose_kernel_command_line(params)
+        self.assertThat(
+            cmdline,
+            ContainsAll([
+                "root=/dev/disk/by-path/ip-",
+                "iscsi_initiator=",
+                "overlayroot=tmpfs",
+                "ip6=off",
+                "ip=::::%s:BOOTIF" % params.hostname]))
+
+    def test_enlist_compose_kernel_command_line_inc_purpose_opts6(self):
+        # The result of compose_kernel_command_line includes the purpose
+        # options for a non "commissioning" node.
+        params = self.make_kernel_parameters(
+            purpose="enlist", fs_host=factory.make_ipv6_address())
+        cmdline = compose_kernel_command_line(params)
+        self.assertThat(
+            cmdline,
+            ContainsAll([
+                "root=/dev/disk/by-path/ip-",
+                "iscsi_initiator=",
+                "overlayroot=tmpfs",
+                "ip=off",
+                "ip6=dhcp"]))
 
     def test_commissioning_compose_kernel_command_line_inc_extra_opts(self):
         mock_get_curtin_sep = self.patch(