Merge lp:~smoser/maas/trunk-remove-hostname-kludge into lp:~maas-committers/maas/trunk

[Scott Moser]

start using ip=::::<hostname>:BOOTIF again

The released version of precise image (20101001) now has suitable
cloud-initramfs-dyn-netconf to turn:
 ip=::::<hostname>:BOOTIF
into
 ip=::::<hostname>:eth0

This lets us tell the initramfs dhcp client (ipconfig) to request the
given hostname, and to explicitly only attempt dhcp on the boot interface.

This is basically a revert of revno 1079.

[Gavin Panella (allenap)]

Looks good, but

- ] + compose_hostname_opts(params)

I think this got lost by accident. It was added only yesterday, by jtv, to pass the correct domain (and hostname, so maybe that needs modification).

review: Needs Fixing

[Scott Moser (smoser)]

It did not get lost.
I removed it as I explicitly want only 'hostname' there.

[Scott Moser (smoser)]

oh yeah, and I explicitly removed it in cleanup a while ago.
there was (and is) no justification for having that on the ephemeral/enlistment command line.

[Gavin Panella (allenap)]

Okay, approved to unblock you, so you can land, but I'm going to add jtv as a reviewer so he gets a chance to chip in.

review: Approve

[Jeroen T. Vermeulen (jtv)]

This leaves only one call site for compose_hostname_opts, and there, domain is always going to be set so the function doesn't get to do much interesting work. We might as well get rid of it then.

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2012-10-01 08:39:59 +0000
+++ src/provisioningserver/kernel_opts.py	2012-10-02 18:57:21 +0000
@@ -132,19 +132,16 @@
             "iscsi_target_ip=%s" % params.fs_host,
             "iscsi_target_port=3260",
             "iscsi_initiator=%s" % params.hostname,
-            # Read by klibc 'ipconfig' in initramfs.
-            "ip=dhcp",  # TODO(smoser) remove this
-            # "ip=::::%s:BOOTIF" % params.hostname, # TODO(smoser) use this
+            # Read by cloud-initramfs-dyn-netconf and klibc's ipconfig
+            # in the initramfs.
+            "ip=::::%s:BOOTIF" % params.hostname,
             # cloud-images have this filesystem label.
             "ro root=LABEL=cloudimg-rootfs",
             # Read by overlayroot package.
             "overlayroot=tmpfs",
             # Read by cloud-init.
             "cloud-config-url=%s" % params.preseed_url,
-            ## TODO(smoser): remove hostname after an ephemeral image is
-            ## released with cloud-initramfs-dyn-netconf. see LP: #1046405 for
-            ## more info. instead use the updated 'ip=' line above.
-            ] + compose_hostname_opts(params)
+            ]
     else:
         # These are options used by the Debian Installer.
         return [

=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2012-10-01 20:25:17 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2012-10-02 18:57:21 +0000
@@ -131,9 +131,7 @@
                 "root=LABEL=cloudimg-rootfs",
                 "iscsi_initiator=",
                 "overlayroot=tmpfs",
-                "ip=dhcp"]))
-        # TODO(smoser) after newer ephemeral image is released, replace
-        # "ip=dhcp" with: "ip=::::%s:BOOTIF" % params.hostname
+                "ip=::::%s:BOOTIF" % params.hostname]))
 
     def test_compose_kernel_command_line_inc_common_opts(self):
         # Test that some kernel arguments appear on both commissioning