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
1=== modified file 'conf/bootloaders.yaml'
2--- conf/bootloaders.yaml 2016-07-29 22:18:43 +0000
3+++ conf/bootloaders.yaml 2016-08-23 15:32:46 +0000
4@@ -54,3 +54,5 @@
5 grub_config: |
6 configfile (pxe)/grub/grub.cfg-${net_default_mac}
7 configfile (pxe)/grub/grub.cfg-default-ppc64el
8+
9+# vi: syntax=yaml nowrap
10
11=== modified file 'conf/centos.yaml'
12--- conf/centos.yaml 2015-10-30 18:31:58 +0000
13+++ conf/centos.yaml 2016-08-23 15:32:46 +0000
14@@ -17,3 +17,5 @@
15 version: 6.6
16 release_title: "CentOS 6.6"
17 curtin_files: "{curtin_path}/centos6"
18+
19+# vi: syntax=yaml nowrap
20
21=== modified file 'conf/meph-v2.yaml'
22--- conf/meph-v2.yaml 2016-05-11 17:32:05 +0000
23+++ conf/meph-v2.yaml 2016-08-23 15:32:46 +0000
24@@ -163,3 +163,5 @@
25 ## http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS
26 ## so for now, we just don't have a stream for that.
27 ## * kernel meta package in all cases here is linux-image-<flavor>
28+
29+# vi: syntax=yaml nowrap
30
31=== modified file 'conf/meph-v3.yaml'
32--- conf/meph-v3.yaml 2016-08-18 08:40:52 +0000
33+++ conf/meph-v3.yaml 2016-08-23 15:32:46 +0000
34@@ -16,148 +16,22 @@
35 # hwe-<release version>. Because the version has a '.' in it we keep the old
36 # naming format for the anchors.
37 subarches:
38- - &sa_hwe_p
39- - generic
40- - hwe-p
41- - &sa_hwe_q
42- - generic
43- - hwe-p
44- - hwe-q
45- - &sa_hwe_r
46- - generic
47- - hwe-p
48- - hwe-q
49- - hwe-r
50- - &sa_hwe_s
51- - generic
52- - hwe-p
53- - hwe-q
54- - hwe-r
55- - hwe-s
56- - &sa_hwe_t
57- - generic
58- - hwe-p
59- - hwe-q
60- - hwe-r
61- - hwe-s
62- - hwe-t
63- - &sa_hwe_u
64- - generic
65- - hwe-p
66- - hwe-q
67- - hwe-r
68- - hwe-s
69- - hwe-t
70- - hwe-u
71- - &sa_hwe_v
72- - generic
73- - hwe-p
74- - hwe-q
75- - hwe-r
76- - hwe-s
77- - hwe-t
78- - hwe-u
79- - hwe-v
80- - &sa_hwe_w
81- - generic
82- - hwe-p
83- - hwe-q
84- - hwe-r
85- - hwe-s
86- - hwe-t
87- - hwe-u
88- - hwe-v
89- - hwe-w
90- - &sa_hwe_x
91- - generic
92- - hwe-p
93- - hwe-q
94- - hwe-r
95- - hwe-s
96- - hwe-t
97- - hwe-u
98- - hwe-v
99- - hwe-w
100- - hwe-16.04
101- - hwe-16.04-lowlatency
102- - &sa_hwe_y
103- - generic
104- - hwe-p
105- - hwe-q
106- - hwe-r
107- - hwe-s
108- - hwe-t
109- - hwe-u
110- - hwe-v
111- - hwe-w
112- - hwe-16.04
113- - hwe-16.04-lowlatency
114- - hwe-16.10
115- - &arm_hwe_t
116- - generic
117- - highbank
118- - hwe-p
119- - hwe-q
120- - hwe-r
121- - hwe-s
122- - hwe-t
123- - &arm_hwe_u
124- - generic
125- - highbank
126- - hwe-p
127- - hwe-q
128- - hwe-r
129- - hwe-s
130- - hwe-t
131- - hwe-u
132- - &arm_hwe_v
133- - generic
134- - highbank
135- - hwe-p
136- - hwe-q
137- - hwe-r
138- - hwe-s
139- - hwe-t
140- - hwe-u
141- - hwe-v
142- - &arm_hwe_w
143- - generic
144- - highbank
145- - hwe-p
146- - hwe-q
147- - hwe-r
148- - hwe-s
149- - hwe-t
150- - hwe-u
151- - hwe-v
152- - hwe-w
153- - &arm_hwe_x
154- - generic
155- - highbank
156- - hwe-p
157- - hwe-q
158- - hwe-r
159- - hwe-s
160- - hwe-t
161- - hwe-u
162- - hwe-v
163- - hwe-w
164- - hwe-16.04
165- - hwe-16.04-lowlatency
166- - &arm_hwe_y
167- - generic
168- - highbank
169- - hwe-p
170- - hwe-q
171- - hwe-r
172- - hwe-s
173- - hwe-t
174- - hwe-u
175- - hwe-v
176- - hwe-w
177- - hwe-16.04
178- - hwe-16.04-lowlatency
179- - hwe-16.10
180+ - &sa_hwe_p [generic, hwe-p]
181+ - &sa_hwe_q [generic, hwe-p, hwe-q]
182+ - &sa_hwe_r [generic, hwe-p, hwe-q, hwe-r]
183+ - &sa_hwe_s [generic, hwe-p, hwe-q, hwe-r, hwe-s]
184+ - &sa_hwe_t [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
185+ - &sa_hwe_u [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
186+ - &sa_hwe_v [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
187+ - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
188+ - &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]
189+ - &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]
190+ - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
191+ - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
192+ - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
193+ - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
194+ - &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]
195+ - &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]
196
197 misc:
198 - &glpae generic-lpae
199@@ -171,181 +45,33 @@
200 - version: "16.10"
201 release: yakkety
202 kernels:
203- -
204- - yakkety
205- - amd64
206- - hwe-16.10
207- - generic
208- - linux-generic
209- - *sa_hwe_y
210- -
211- - yakkety
212- - arm64
213- - hwe-16.10
214- - generic
215- - linux-generic
216- - *sa_hwe_y
217- -
218- - yakkety
219- - arm64
220- - *mustang
221- - generic
222- - linux-generic
223- - [*mustang]
224- - *kh-mustang
225- -
226- - yakkety
227- - arm64
228- - *xguboot
229- - generic
230- - linux-generic
231- - [*xguboot]
232- - *kh-xgene
233- -
234- - yakkety
235- - armhf
236- - *glpae
237- - *glpae
238- - linux-generic-lpae
239- - [*glpae]
240- -
241- - yakkety
242- - armhf
243- - hwe-16.10
244- - generic
245- - linux-generic
246- - *arm_hwe_y
247- -
248- - yakkety
249- - i386
250- - hwe-16.10
251- - generic
252- - linux-generic
253- - *sa_hwe_y
254- -
255- - yakkety
256- - ppc64el
257- - hwe-16.10
258- - generic
259- - linux-generic
260- - *sa_hwe_y
261- -
262- - yakkety
263- - s390x
264- - hwe-16.10
265- - generic
266- - linux-generic
267- - *sa_hwe_y
268+ - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
269+ - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
270+ - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
271+ - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
272+ - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
273+ - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]
274+ - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]
275+ - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]
276+ - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]
277 - version: "16.04"
278 release: xenial
279 kernels:
280- -
281- - xenial
282- - amd64
283- - hwe-16.04
284- - generic
285- - linux-generic
286- - *sa_hwe_x
287- -
288- - xenial
289- - amd64
290- - hwe-16.04-lowlatency
291- - lowlatency
292- - linux-image-lowlatency-lts-xenial
293- - *sa_hwe_x
294- -
295- - xenial
296- - arm64
297- - hwe-16.04
298- - generic
299- - linux-generic
300- - *sa_hwe_x
301- -
302- - xenial
303- - arm64
304- - hwe-16.04-lowlatency
305- - lowlatency
306- - linux-image-lowlatency-lts-xenial
307- - *sa_hwe_x
308- -
309- - xenial
310- - arm64
311- - *mustang
312- - generic
313- - linux-generic
314- - [*mustang]
315- - *kh-mustang
316- -
317- - xenial
318- - arm64
319- - *xguboot
320- - generic
321- - linux-generic
322- - [*xguboot]
323- - *kh-xgene
324- -
325- - xenial
326- - armhf
327- - *glpae
328- - *glpae
329- - linux-generic-lpae
330- - [*glpae]
331- -
332- - xenial
333- - armhf
334- - hwe-16.04
335- - generic
336- - linux-generic
337- - *arm_hwe_x
338- -
339- - xenial
340- - armhf
341- - hwe-16.04-lowlatency
342- - lowlatency
343- - linux-image-lowlatency-lts-xenial
344- - *arm_hwe_x
345- -
346- - xenial
347- - i386
348- - hwe-16.04
349- - generic
350- - linux-generic
351- - *sa_hwe_x
352- -
353- - xenial
354- - i386
355- - hwe-16.04-lowlatency
356- - lowlatency
357- - linux-image-lowlatency-lts-xenial
358- - *sa_hwe_x
359- -
360- - xenial
361- - ppc64el
362- - hwe-16.04
363- - generic
364- - linux-generic
365- - *sa_hwe_x
366- -
367- - xenial
368- - ppc64el
369- - hwe-16.04-lowlatency
370- - lowlatency
371- - linux-image-lowlatency-lts-xenial
372- - *sa_hwe_x
373- -
374- - xenial
375- - s390x
376- - hwe-16.04
377- - generic
378- - linux-generic
379- - *sa_hwe_x
380- -
381- - xenial
382- - s390x
383- - hwe-16.04-lowlatency
384- - lowlatency
385- - linux-image-lowlatency-lts-xenial
386- - *sa_hwe_x
387+ - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
388+ - [xenial, amd64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
389+ - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
390+ - [xenial, arm64, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
391+ - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
392+ - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
393+ - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
394+ - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]
395+ - [xenial, armhf, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *arm_hwe_x]
396+ - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]
397+ - [xenial, i386, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
398+ - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]
399+ - [xenial, ppc64el, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
400+ - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]
401+ - [xenial, s390x, hwe-16.04-lowlatency, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
402 - version: "14.04"
403 builtin_kernel: linux-generic
404 release: trusty
405@@ -406,3 +132,5 @@
406 ## 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.
408 ## * kernel meta package in all cases here is linux-image-<flavor>
409+
410+# vi: syntax=yaml nowrap

Subscribers

People subscribed via source and target branches