launchpad-reviewers team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging lp:~smoser/maas/lp1052660 into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1052660 in MAAS: "booting with multiple nics broken due to ip=::::hostname"
  https://bugs.launchpad.net/maas/+bug/1052660

For more details, see:
https://code.launchpad.net/~smoser/maas/lp1052660/+merge/125046
-- 
https://code.launchpad.net/~smoser/maas/lp1052660/+merge/125046
Your team MAAS Maintainers is requested to review the proposed merge of lp:~smoser/maas/lp1052660 into lp:maas.

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2012-09-17 15:17:01 +0000
+++ src/provisioningserver/kernel_opts.py	2012-09-18 20:50:24 +0000
@@ -120,7 +120,7 @@
             "iscsi_target_port=3260",
             "iscsi_initiator=%s" % params.hostname,
             # Read by klibc 'ipconfig' in initramfs.
-            "ip=::::%s" % params.hostname,
+            "ip=dhcp",
             # cloud-images have this filesystem label.
             "ro root=LABEL=cloudimg-rootfs",
             # Read by overlayroot package.

=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2012-09-17 15:17:20 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2012-09-18 20:50:24 +0000
@@ -125,7 +125,7 @@
                 "root=LABEL=cloudimg-rootfs",
                 "iscsi_initiator=",
                 "overlayroot=tmpfs",
-                "ip=::::%s" % params.hostname]))
+                "ip=dhcp")
 
     def test_compose_kernel_command_line_inc_common_opts(self):
         # Test that some kernel arguments appear on both commissioning