Merge lp:~andreserl/maas/lp1582323_2.1 into lp:maas/2.1

Proposed by Andres Rodriguez on 2016-12-06
Status: Merged
Approved by: Andres Rodriguez on 2016-12-06
Approved revision: 5562
Merged at revision: 5561
Proposed branch: lp:~andreserl/maas/lp1582323_2.1
Merge into: lp:maas/2.1
Diff against target: 121 lines (+56/-12)
3 files modified
docs/changelog.rst (+18/-12)
src/provisioningserver/kernel_opts.py (+2/-0)
src/provisioningserver/tests/test_kernel_opts.py (+36/-0)
To merge this branch: bzr merge lp:~andreserl/maas/lp1582323_2.1
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-12-06
Review via email: mp+312558@code.launchpad.net

Commit message

Backport rev5586 from lp:maas: Select MAAS datasource specifically to ensure commissioning doesn't fail when competing cloud metadata resides on disk

To post a comment you must log in.
lp:~andreserl/maas/lp1582323_2.1 updated on 2016-12-06
5562. By Andres Rodriguez on 2016-12-06

Fix CHANGELOG

Andres Rodriguez (andreserl) wrote :

selfie as this is a backport

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 2016-12-02 12:15:16 +0000
3+++ docs/changelog.rst 2016-12-06 13:21:03 +0000
4@@ -9,6 +9,24 @@
5 --------------------------
6
7
8+LP: #1582323 Select MAAS datasource specifically to ensure commissioning doesn't fail when competing cloud metadata resides on disk
9+
10+LP: #1646163 [2.1] Icon need to be improved
11+
12+LP: #1646162 [2.1] Sticky header has been removed
13+
14+LP: #1646160 [2.1] Device discovery UI does not have a loading state
15+
16+LP: #1628126 [2.1, FUJ] Column layout shouldn't resize until screen is smaller than 1440
17+
18+LP: #1628058 [2.1, FUJ] The form spacing is not compatible to the designs
19+
20+LP: #1628054 [2.1, FUJ] Section complete/incomplete icon
21+
22+LP: #1639182 [2.1] log format differs for Yakkety
23+
24+LP: #1637401 Re-adding virsh chassis to discover new nodes powers down existing nodes
25+
26
27 2.1.2
28 =====
29@@ -417,18 +435,6 @@
30
31 LP: #1605476 [2.0rc2] Changing DNSSEC validation does not trigger configuration file update
32
33-LP: #1646163 [2.1] Icon need to be improved
34-
35-LP: #1646162 [2.1] Sticky header has been removed
36-
37-LP: #1646160 [2.1] Device discovery UI does not have a loading state
38-
39-LP: #1628126 [2.1, FUJ] Column layout shouldn't resize until screen is smaller than 1440
40-
41-LP: #1628058 [2.1, FUJ] The form spacing is not compatible to the designs
42-
43-LP: #1628054 [2.1, FUJ] Section complete/incomplete icon
44-
45
46 2.1.0 (beta2)
47 =============
48
49=== modified file 'src/provisioningserver/kernel_opts.py'
50--- src/provisioningserver/kernel_opts.py 2016-11-07 09:56:02 +0000
51+++ src/provisioningserver/kernel_opts.py 2016-12-06 13:21:03 +0000
52@@ -150,6 +150,8 @@
53 params.fs_host, "3260", tname),
54 # Read by overlayroot package.
55 "overlayroot=tmpfs",
56+ # Select the MAAS datasource by default.
57+ "cc:{'datasource_list': ['MAAS']}end_cc",
58 # Read by cloud-init.
59 "cloud-config-url=%s" % params.preseed_url,
60 ]
61
62=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
63--- src/provisioningserver/tests/test_kernel_opts.py 2016-10-28 15:36:39 +0000
64+++ src/provisioningserver/tests/test_kernel_opts.py 2016-12-06 13:21:03 +0000
65@@ -214,6 +214,18 @@
66 "ip=off",
67 "ip6=dhcp"]))
68
69+ def test_xinstall_compose_kernel_command_line_inc_cc_datasource(self):
70+ # The result of compose_kernel_command_line includes the cloud-init
71+ # options for the datasource and cloud-config-url
72+ params = self.make_kernel_parameters(
73+ purpose="xinstall", fs_host=factory.make_ipv4_address())
74+ cmdline = compose_kernel_command_line(params)
75+ self.assertThat(
76+ cmdline,
77+ ContainsAll([
78+ "cc:{'datasource_list': ['MAAS']}end_cc",
79+ "cloud-config-url=%s" % params.preseed_url]))
80+
81 def test_commissioning_compose_kernel_command_line_inc_purpose_opts4(self):
82 # The result of compose_kernel_command_line includes the purpose
83 # options for a non "commissioning" node.
84@@ -244,6 +256,18 @@
85 "ip=off",
86 "ip6=dhcp"]))
87
88+ def test_commissioning_compose_kernel_command_line_inc_cc_datasource(self):
89+ # The result of compose_kernel_command_line includes the cloud-init
90+ # options for the datasource and cloud-config-url
91+ params = self.make_kernel_parameters(
92+ purpose="commissioning", fs_host=factory.make_ipv4_address())
93+ cmdline = compose_kernel_command_line(params)
94+ self.assertThat(
95+ cmdline,
96+ ContainsAll([
97+ "cc:{'datasource_list': ['MAAS']}end_cc",
98+ "cloud-config-url=%s" % params.preseed_url]))
99+
100 def test_enlist_compose_kernel_command_line_inc_purpose_opts4(self):
101 # The result of compose_kernel_command_line includes the purpose
102 # options for a non "commissioning" node.
103@@ -274,6 +298,18 @@
104 "ip=off",
105 "ip6=dhcp"]))
106
107+ def test_enlist_compose_kernel_command_line_inc_cc_datasource(self):
108+ # The result of compose_kernel_command_line includes the cloud-init
109+ # options for the datasource and cloud-config-url
110+ params = self.make_kernel_parameters(
111+ purpose="enlist", fs_host=factory.make_ipv4_address())
112+ cmdline = compose_kernel_command_line(params)
113+ self.assertThat(
114+ cmdline,
115+ ContainsAll([
116+ "cc:{'datasource_list': ['MAAS']}end_cc",
117+ "cloud-config-url=%s" % params.preseed_url]))
118+
119 def test_commissioning_compose_kernel_command_line_inc_extra_opts(self):
120 mock_get_curtin_sep = self.patch(
121 kernel_opts, 'get_curtin_kernel_cmdline_sep')

Subscribers

People subscribed via source and target branches