Merge lp:~andreserl/maas/lp_1459865 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Fix LP: #1459865: Fix enlistment by ensuring correct kernel parameters are being passed.

[Blake Rouse (blake-rouse)]

Adjust the if and a test would be nice for this.

review: Approve

[Andres Rodriguez (andreserl)]

review: Approve

[Christian Reis (kiko)]

No test?

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2015-07-09 13:38:56 +0000
+++ src/provisioningserver/kernel_opts.py	2015-08-12 16:33:34 +0000
@@ -127,7 +127,7 @@
 
 def compose_purpose_opts(params):
     """Return the list of the purpose-specific kernel options."""
-    if params.purpose == "commissioning" or params.purpose == "xinstall":
+    if params.purpose in ["commissioning", "xinstall", "enlist"]:
         # These are kernel parameters read by the ephemeral environment.
         tname = prefix_target_name(
             get_ephemeral_name(

=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2015-07-09 13:38:56 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2015-08-12 16:33:34 +0000
@@ -216,6 +216,19 @@
                 "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_commissioning_compose_kernel_command_line_inc_extra_opts(self):
         mock_get_curtin_sep = self.patch(
             kernel_opts, 'get_curtin_kernel_cmdline_sep')