MAAS

Merge lp:~smoser/maas/lp1052660 into lp:maas/trunk

  1. lp1052660
  2. Merge into trunk
Proposed by Scott Moser on 2012-09-18
Status: Merged
Approved by: Scott Moser on 2012-09-18
Approved revision: 1019
Merged at revision: 1018
Proposed branch: lp:~smoser/maas/lp1052660
Merge into: lp:maas/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
src/provisioningserver/kernel_opts.py (+1/-1)
src/provisioningserver/tests/test_kernel_opts.py (+1/-1)
To merge this branch: bzr merge lp:~smoser/maas/lp1052660
Reviewer Review Type Date Requested Status
Andres Rodriguez 2012-09-18 Approve on 2012-09-18
Review via email: mp+125046@code.launchpad.net

Commit Message

Change kernel cmdline from 'ip=::::<hostname>' back to 'ip=dhcp'

Description of the Change

Change kernel cmdline 'ip=::::<hostname>' back to 'ip=dhcp'

ip=dhcp is handled specially in the initramfs code, and essentially magically gets us behavior of setting DEVICE = BOOTIF parameter.

There is no other way to do this that I can see. Removing 'ip=::::<hostname>' means we are losing the ddns functionality that we nearly got for free under bug 1046405.

To post a comment you must log in.
Scott Moser (smoser) wrote :

Change kernel cmdline 'ip=::::<hostname>' back to 'ip=dhcp'

ip=dhcp is handled specially in the initramfs code, and essentially magically gets us behavior of setting DEVICE = BOOTIF parameter.

There is no other way to do this that I can see. Removing 'ip=::::<hostname>' means we are losing the ddns functionality that we nearly got for free under bug 1046405.

Andres Rodriguez (andreserl) wrote :

ACK!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/kernel_opts.py'
2--- src/provisioningserver/kernel_opts.py 2012-09-17 15:17:01 +0000
3+++ src/provisioningserver/kernel_opts.py 2012-09-18 20:50:24 +0000
4@@ -120,7 +120,7 @@
5 "iscsi_target_port=3260",
6 "iscsi_initiator=%s" % params.hostname,
7 # Read by klibc 'ipconfig' in initramfs.
8- "ip=::::%s" % params.hostname,
9+ "ip=dhcp",
10 # cloud-images have this filesystem label.
11 "ro root=LABEL=cloudimg-rootfs",
12 # Read by overlayroot package.
13
14=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
15--- src/provisioningserver/tests/test_kernel_opts.py 2012-09-17 15:17:20 +0000
16+++ src/provisioningserver/tests/test_kernel_opts.py 2012-09-18 20:50:24 +0000
17@@ -125,7 +125,7 @@
18 "root=LABEL=cloudimg-rootfs",
19 "iscsi_initiator=",
20 "overlayroot=tmpfs",
21- "ip=::::%s" % params.hostname]))
22+ "ip=dhcp")
23
24 def test_compose_kernel_command_line_inc_common_opts(self):
25 # Test that some kernel arguments appear on both commissioning