maas-images

Merge lp:~smoser/maas-images/trunk.v3-formatting into lp:maas-images

  1. trunk.v3-formatting
  2. Merge into maas-ephemerals
Proposed by Scott Moser
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 324
Merged at revision: 323
Proposed branch: lp:~smoser/maas-images/trunk.v3-formatting
Merge into: lp:maas-images
Diff against target: 410 lines (+48/-314)
4 files modified
conf/bootloaders.yaml (+2/-0)
conf/centos.yaml (+2/-0)
conf/meph-v2.yaml (+2/-0)
conf/meph-v3.yaml (+42/-314)
To merge this branch: bzr merge lp:~smoser/maas-images/trunk.v3-formatting
Reviewer Review Type Date Requested Status
Lee Trager (community) Needs Information
Andres Rodriguez (community) Approve
Review via email: mp+303693@code.launchpad.net

Commit message

conf/: improve formatting, add vi modelines

This makes the formatting in conf/meph-v3.yaml more vertically compact.
It makes it much easier for a human to compare the differences between two lines.

To post a comment you must log in.
lp:~smoser/maas-images/trunk.v3-formatting updated
324. By Scott Moser

conf/meph-v3.yaml: fix formatting for easier reading

The long vertical sections are hard to read and see what
is happening among a change.

Revision history for this message
Scott Moser (smoser) wrote :

You can verify that old file == new file by doing something like:

$ python -c 'import yaml, sys; print(yaml.load(open(sys.argv[1])) == yaml.load(open(sys.argv[2])))' conf/meph-v3.yaml.old conf/meph-v3.yaml
True

Revision history for this message
Scott Moser (smoser) wrote :

I'd also like to raise an issue on the data being created here.

You are producing a kernel with "primary subarch" of
  hwe-16.04
and
  hwe-16.04-lowlatency

But you set their "subarches" to the same string.

How should one determine that one provides "low latency"?

When there is a hwe-16.10-lowlatency kernel, how will someone know that that would suffice if a user needed low latency ?

I'm not insisting that 'subarches' be used to indicate lowlatency, but i'm interested in how maas is knowing about this information.

It seems that we should add some metadata that explicitly sets the 'lowlatency' or generically "flavor" of the kernel.

Revision history for this message
Andres Rodriguez (andreserl) wrote :

Hi Scott,

Approving your branch. As far as your questions:

In the past, MAAS would use "subarch" on a machine to differentiate between generic/hwe-t/hwe-x/etc kernels. Starting from MAAS 1.9, however, MAAS no longer bundles a "kernel" as part of the subarch. We have a separate attribute to define the kernel that machine will obtain. For example:

1. arch = amd64
2. subarch = generic
3. hwe_kernel = hwe-t, hwe-x, hwe-16.10-lowlatency

That said, however, the only place where "subarches" still exist in MAAS is for the import process because that's the way how the streams defined additional kernels. In other words, the streams were originally designed to provide kernel flavors as subarches.

That said, I'm fine with improving the streams to make the additional separation between what a subarch is and what a kernel flavor is (whether it is hwe-x, hwe-t or hwe-16.10-lowlatency), but I think that since this would impact the MAAS image import process, we should discuss this at the upcoming sprint, and evaluate what the impact is. For now, we will continue to assume, in the streams, that subarch provide the kernel flavors.

review: Approve
Revision history for this message
Lee Trager (ltrager) wrote :

The reason I changed formats is because the new kernel names are causing many lines to go way over the standard 80 character limit.

The longest line we'll have in a release is

 - [xenial, arm64, hwe-rolling-lowlatency-edge, lowlatency, linux-hwe-rolling-lowlatency-edge, *sa_hwe_x]

Which is 105 characters. I can live with that in the release section but I'm concerned about the growing subarch anchor section. Once Yakkety is released with all kernels we'll have

 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-edge, hwe-16.04-lowlatency, hwe-16.04-lowlatency-edge, hwe-16.10, hwe-16.10-edge, hwe-16.10-lowlatency, hwe-16.10-lowlatency-edge, hwe-rolling, hwe-rolling-edge, hwe-rolling-lowlatency, hwe-rolling-lowlatency-edge]

That is 314 characters and for each new release we'll be adding an additional 76 characters.

I suggest we compromise and keep the subarch anchors each on its own line while condensing the releases vertically.

review: Needs Information
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Lee, shouldn't yaml just parse that correctly if we were to:

[one, two, three,
four,five,six,
seven,eight,nine]

?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'conf/bootloaders.yaml'
--- conf/bootloaders.yaml 2016-07-29 22:18:43 +0000
+++ conf/bootloaders.yaml 2016-08-23 15:32:46 +0000
@@ -54,3 +54,5 @@
54 grub_config: |54 grub_config: |
55 configfile (pxe)/grub/grub.cfg-${net_default_mac}55 configfile (pxe)/grub/grub.cfg-${net_default_mac}
56 configfile (pxe)/grub/grub.cfg-default-ppc64el56 configfile (pxe)/grub/grub.cfg-default-ppc64el
57
58# vi: syntax=yaml nowrap
5759
=== modified file 'conf/centos.yaml'
--- conf/centos.yaml 2015-10-30 18:31:58 +0000
+++ conf/centos.yaml 2016-08-23 15:32:46 +0000
@@ -17,3 +17,5 @@
17 version: 6.617 version: 6.6
18 release_title: "CentOS 6.6"18 release_title: "CentOS 6.6"
19 curtin_files: "{curtin_path}/centos6"19 curtin_files: "{curtin_path}/centos6"
20
21# vi: syntax=yaml nowrap
2022
=== modified file 'conf/meph-v2.yaml'
--- conf/meph-v2.yaml 2016-05-11 17:32:05 +0000
+++ conf/meph-v2.yaml 2016-08-23 15:32:46 +0000
@@ -163,3 +163,5 @@
163## http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS163## http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS
164## so for now, we just don't have a stream for that.164## so for now, we just don't have a stream for that.
165## * kernel meta package in all cases here is linux-image-<flavor>165## * kernel meta package in all cases here is linux-image-<flavor>
166
167# vi: syntax=yaml nowrap
166168
=== modified file 'conf/meph-v3.yaml'
--- conf/meph-v3.yaml 2016-08-18 08:40:52 +0000
+++ conf/meph-v3.yaml 2016-08-23 15:32:46 +0000
@@ -16,148 +16,22 @@
16# hwe-<release version>. Because the version has a '.' in it we keep the old16# hwe-<release version>. Because the version has a '.' in it we keep the old
17# naming format for the anchors.17# naming format for the anchors.
18subarches:18subarches:
19 - &sa_hwe_p19 - &sa_hwe_p [generic, hwe-p]
20 - generic20 - &sa_hwe_q [generic, hwe-p, hwe-q]
21 - hwe-p21 - &sa_hwe_r [generic, hwe-p, hwe-q, hwe-r]
22 - &sa_hwe_q22 - &sa_hwe_s [generic, hwe-p, hwe-q, hwe-r, hwe-s]
23 - generic23 - &sa_hwe_t [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
24 - hwe-p24 - &sa_hwe_u [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
25 - hwe-q25 - &sa_hwe_v [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
26 - &sa_hwe_r26 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
27 - generic27 - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency]
28 - hwe-p28 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency, hwe-16.10]
29 - hwe-q29 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
30 - hwe-r30 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
31 - &sa_hwe_s31 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
32 - generic32 - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
33 - hwe-p33 - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency]
34 - hwe-q34 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-16.04, hwe-16.04-lowlatency, hwe-16.10]
35 - hwe-r
36 - hwe-s
37 - &sa_hwe_t
38 - generic
39 - hwe-p
40 - hwe-q
41 - hwe-r
42 - hwe-s
43 - hwe-t
44 - &sa_hwe_u
45 - generic
46 - hwe-p
47 - hwe-q
48 - hwe-r
49 - hwe-s
50 - hwe-t
51 - hwe-u
52 - &sa_hwe_v
53 - generic
54 - hwe-p
55 - hwe-q
56 - hwe-r
57 - hwe-s
58 - hwe-t
59 - hwe-u
60 - hwe-v
61 - &sa_hwe_w
62 - generic
63 - hwe-p
64 - hwe-q
65 - hwe-r
66 - hwe-s
67 - hwe-t
68 - hwe-u
69 - hwe-v
70 - hwe-w
71 - &sa_hwe_x
72 - generic
73 - hwe-p
74 - hwe-q
75 - hwe-r
76 - hwe-s
77 - hwe-t
78 - hwe-u
79 - hwe-v
80 - hwe-w
81 - hwe-16.04
82 - hwe-16.04-lowlatency
83 - &sa_hwe_y
84 - generic
85 - hwe-p
86 - hwe-q
87 - hwe-r
88 - hwe-s
89 - hwe-t
90 - hwe-u
91 - hwe-v
92 - hwe-w
93 - hwe-16.04
94 - hwe-16.04-lowlatency
95 - hwe-16.10
96 - &arm_hwe_t
97 - generic
98 - highbank
99 - hwe-p
100 - hwe-q
101 - hwe-r
102 - hwe-s
103 - hwe-t
104 - &arm_hwe_u
105 - generic
106 - highbank
107 - hwe-p
108 - hwe-q
109 - hwe-r
110 - hwe-s
111 - hwe-t
112 - hwe-u
113 - &arm_hwe_v
114 - generic
115 - highbank
116 - hwe-p
117 - hwe-q
118 - hwe-r
119 - hwe-s
120 - hwe-t
121 - hwe-u
122 - hwe-v
123 - &arm_hwe_w
124 - generic
125 - highbank
126 - hwe-p
127 - hwe-q
128 - hwe-r
129 - hwe-s
130 - hwe-t
131 - hwe-u
132 - hwe-v
133 - hwe-w
134 - &arm_hwe_x
135 - generic
136 - highbank
137 - hwe-p
138 - hwe-q
139 - hwe-r
140 - hwe-s
141 - hwe-t
142 - hwe-u
143 - hwe-v
144 - hwe-w
145 - hwe-16.04
146 - hwe-16.04-lowlatency
147 - &arm_hwe_y
148 - generic
149 - highbank
150 - hwe-p
151 - hwe-q
152 - hwe-r
153 - hwe-s
154 - hwe-t
155 - hwe-u
156 - hwe-v
157 - hwe-w
158 - hwe-16.04
159 - hwe-16.04-lowlatency
160 - hwe-16.10
16135
162misc:36misc:
163 - &glpae generic-lpae37 - &glpae generic-lpae
@@ -171,181 +45,33 @@
171 - version: "16.10"45 - version: "16.10"
172 release: yakkety46 release: yakkety
173 kernels:47 kernels:
174 -48 - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
175 - yakkety49 - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
176 - amd6450 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
177 - hwe-16.1051 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
178 - generic52 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
179 - linux-generic53 - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]
180 - *sa_hwe_y54 - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]
181 -55 - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]
182 - yakkety56 - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]
183 - arm64
184 - hwe-16.10
185 - generic
186 - linux-generic
187 - *sa_hwe_y
188 -
189 - yakkety
190 - arm64
191 - *mustang
192 - generic
193 - linux-generic
194 - [*mustang]
195 - *kh-mustang
196 -
197 - yakkety
198 - arm64
199 - *xguboot
200 - generic
201 - linux-generic
202 - [*xguboot]
203 - *kh-xgene
204 -
205 - yakkety
206 - armhf
207 - *glpae
208 - *glpae
209 - linux-generic-lpae
210 - [*glpae]
211 -
212 - yakkety
213 - armhf
214 - hwe-16.10
215 - generic
216 - linux-generic
217 - *arm_hwe_y
218 -
219 - yakkety
220 - i386
221 - hwe-16.10
222 - generic
223 - linux-generic
224 - *sa_hwe_y
225 -
226 - yakkety
227 - ppc64el
228 - hwe-16.10
229 - generic
230 - linux-generic
231 - *sa_hwe_y
232 -
233 - yakkety
234 - s390x
235 - hwe-16.10
236 - generic
237 - linux-generic
238 - *sa_hwe_y
239 - version: "16.04"57 - version: "16.04"
240 release: xenial58 release: xenial
241 kernels:59 kernels:
242 -60 - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
243 - xenial61 - [xenial, amd64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
244 - amd6462 - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
245 - hwe-16.0463 - [xenial, arm64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
246 - generic64 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
247 - linux-generic65 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
248 - *sa_hwe_x66 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
249 -67 - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]
250 - xenial68 - [xenial, armhf, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *arm_hwe_x]
251 - amd6469 - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]
252 - hwe-16.04-lowlatency70 - [xenial, i386, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
253 - lowlatency71 - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]
254 - linux-image-lowlatency-lts-xenial72 - [xenial, ppc64el, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
255 - *sa_hwe_x73 - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]
256 -74 - [xenial, s390x, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
257 - xenial
258 - arm64
259 - hwe-16.04
260 - generic
261 - linux-generic
262 - *sa_hwe_x
263 -
264 - xenial
265 - arm64
266 - hwe-16.04-lowlatency
267 - lowlatency
268 - linux-image-lowlatency-lts-xenial
269 - *sa_hwe_x
270 -
271 - xenial
272 - arm64
273 - *mustang
274 - generic
275 - linux-generic
276 - [*mustang]
277 - *kh-mustang
278 -
279 - xenial
280 - arm64
281 - *xguboot
282 - generic
283 - linux-generic
284 - [*xguboot]
285 - *kh-xgene
286 -
287 - xenial
288 - armhf
289 - *glpae
290 - *glpae
291 - linux-generic-lpae
292 - [*glpae]
293 -
294 - xenial
295 - armhf
296 - hwe-16.04
297 - generic
298 - linux-generic
299 - *arm_hwe_x
300 -
301 - xenial
302 - armhf
303 - hwe-16.04-lowlatency
304 - lowlatency
305 - linux-image-lowlatency-lts-xenial
306 - *arm_hwe_x
307 -
308 - xenial
309 - i386
310 - hwe-16.04
311 - generic
312 - linux-generic
313 - *sa_hwe_x
314 -
315 - xenial
316 - i386
317 - hwe-16.04-lowlatency
318 - lowlatency
319 - linux-image-lowlatency-lts-xenial
320 - *sa_hwe_x
321 -
322 - xenial
323 - ppc64el
324 - hwe-16.04
325 - generic
326 - linux-generic
327 - *sa_hwe_x
328 -
329 - xenial
330 - ppc64el
331 - hwe-16.04-lowlatency
332 - lowlatency
333 - linux-image-lowlatency-lts-xenial
334 - *sa_hwe_x
335 -
336 - xenial
337 - s390x
338 - hwe-16.04
339 - generic
340 - linux-generic
341 - *sa_hwe_x
342 -
343 - xenial
344 - s390x
345 - hwe-16.04-lowlatency
346 - lowlatency
347 - linux-image-lowlatency-lts-xenial
348 - *sa_hwe_x
349 - version: "14.04"75 - version: "14.04"
350 builtin_kernel: linux-generic76 builtin_kernel: linux-generic
351 release: trusty77 release: trusty
@@ -406,3 +132,5 @@
406## http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS132## http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS
407## so for now, we just don't have a stream for that.133## so for now, we just don't have a stream for that.
408## * kernel meta package in all cases here is linux-image-<flavor>134## * kernel meta package in all cases here is linux-image-<flavor>
135
136# vi: syntax=yaml nowrap

Subscribers

People subscribed via source and target branches