Merge lp:~andreserl/maas/lp1459865_1.8 into lp:maas/1.8

Proposed by Andres Rodriguez on 2015-08-12
Status: Merged
Approved by: Andres Rodriguez on 2015-08-12
Approved revision: 4038
Merged at revision: 4037
Proposed branch: lp:~andreserl/maas/lp1459865_1.8
Merge into: lp:maas/1.8
Diff against target: 58 lines (+25/-1)
3 files modified
docs/changelog.rst (+11/-0)
src/provisioningserver/kernel_opts.py (+1/-1)
src/provisioningserver/tests/test_kernel_opts.py (+13/-0)
To merge this branch: bzr merge lp:~andreserl/maas/lp1459865_1.8
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2015-08-12
Review via email: mp+267878@code.launchpad.net

Commit message

Backport rev4182: Fix enlistment by ensuring correct kernel parameters are being passed & update changelog.

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

self approve as this was approved in trunk and 1.8 is affected.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/changelog.rst'
2--- docs/changelog.rst 2015-08-05 15:57:00 +0000
3+++ docs/changelog.rst 2015-08-12 21:24:01 +0000
4@@ -3,6 +3,17 @@
5 =========
6
7
8+1.8.2
9+=====
10+
11+See https://launchpad.net/maas/+milestone/1.8.2 for full details.
12+
13+Bug Fix Update
14+--------------
15+
16+#1459865 Fix enlistment to always use the correct kernel parameters.
17+
18+
19 1.8.1
20 =====
21
22
23=== modified file 'src/provisioningserver/kernel_opts.py'
24--- src/provisioningserver/kernel_opts.py 2015-07-13 21:00:00 +0000
25+++ src/provisioningserver/kernel_opts.py 2015-08-12 21:24:01 +0000
26@@ -127,7 +127,7 @@
27
28 def compose_purpose_opts(params):
29 """Return the list of the purpose-specific kernel options."""
30- if params.purpose == "commissioning" or params.purpose == "xinstall":
31+ if params.purpose in ["commissioning", "xinstall", "enlist"]:
32 # These are kernel parameters read by the ephemeral environment.
33 tname = prefix_target_name(
34 get_ephemeral_name(
35
36=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
37--- src/provisioningserver/tests/test_kernel_opts.py 2015-07-13 21:00:00 +0000
38+++ src/provisioningserver/tests/test_kernel_opts.py 2015-08-12 21:24:01 +0000
39@@ -216,6 +216,19 @@
40 "overlayroot=tmpfs",
41 "ip=::::%s:BOOTIF" % params.hostname]))
42
43+ def test_enlist_compose_kernel_command_line_inc_purpose_opts(self):
44+ # The result of compose_kernel_command_line includes the purpose
45+ # options for a non "commissioning" node.
46+ params = self.make_kernel_parameters(purpose="enlist")
47+ cmdline = compose_kernel_command_line(params)
48+ self.assertThat(
49+ cmdline,
50+ ContainsAll([
51+ "root=/dev/disk/by-path/ip-",
52+ "iscsi_initiator=",
53+ "overlayroot=tmpfs",
54+ "ip=::::%s:BOOTIF" % params.hostname]))
55+
56 def test_commissioning_compose_kernel_command_line_inc_extra_opts(self):
57 mock_get_curtin_sep = self.patch(
58 kernel_opts, 'get_curtin_kernel_cmdline_sep')

Subscribers

People subscribed via source and target branches