Merge lp:~andreserl/debian-cd/maas into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 1935
Proposed branch: lp:~andreserl/debian-cd/maas
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 37 lines (+18/-7)
1 file modified
tools/boot/xenial/boot-amd64 (+18/-7)
To merge this branch: bzr merge lp:~andreserl/debian-cd/maas
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre (community) Approve
VCS imports Pending
Review via email: mp+291285@code.launchpad.net

This proposal supersedes a proposal from 2016-04-07.

Commit message

Add CD Options for Installing MAAS Region Controller and Rack Controller.

Description of the change

This branch adds the too options and replaces the old way of installing MAAS from the CD. This is dependent in the following branch been released in Ubuntu:
https://code.launchpad.net/~andreserl/maas/lp1561954/+merge/291259

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

It looks reasonable, but why add the menu items in two passes at writing to txt.cfg or grub.cfg, if you can do it in just one?

You also can't use the 'cloud' label twice, that label will be used to start the right menu option if all you have is a command-line, so it can be useful on, for instance, powerpc.

Please fix the labels and make it all a write in one go ;)

review: Needs Fixing
lp:~andreserl/debian-cd/maas updated
1936. By Andres Rodriguez on 2016-04-07

Fix installer

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks great now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/xenial/boot-amd64'
2--- tools/boot/xenial/boot-amd64 2015-10-22 16:03:46 +0000
3+++ tools/boot/xenial/boot-amd64 2016-04-07 21:18:09 +0000
4@@ -527,15 +527,26 @@
5 # This really ought to be in gfxboot.cfg instead, but we want to
6 # make it particularly prominent.
7 cat >> boot$N/isolinux/txt.cfg <<EOF
8-label cloud
9- menu label ^Multiple server install with MAAS
10- kernel /install/vmlinuz
11- append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
12+label maas
13+ menu label ^Install MAAS Region Controller
14+ kernel /install/vmlinuz
15+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-region-udeb vga=788 initrd=/install/initrd.gz quiet ---
16+
17+label maasrack
18+ menu label ^Install MAAS Rack Controller
19+ kernel /install/vmlinuz
20+ append $KERNEL_PARAMS $FRONTEND_BACKGROUND modules=maas-rack-udeb vga=788 initrd=/install/initrd.gz quiet ---
21 EOF
22 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
23-menuentry "Multiple server install with MAAS" {
24- set gfxpayload=keep
25- linux /install/vmlinuz $KERNEL_PARAMS modules=maas-enlist-udeb vga=788 initrd=/install/initrd.gz quiet ---
26+menuentry "Install MAAS Region Controller" {
27+ set gfxpayload=keep
28+ linux /install/vmlinuz $KERNEL_PARAMS modules=maas-region-udeb vga=788 initrd=/install/initrd.gz quiet ---
29+ initrd /install/initrd.gz
30+}
31+
32+menuentry "Install MAAS Rack Controller" {
33+ set gfxpayload=keep
34+ linux /install/vmlinuz $KERNEL_PARAMS modules=maas-rack-udeb vga=788 initrd=/install/initrd.gz quiet ---
35 initrd /install/initrd.gz
36 }
37 EOF

Subscribers

People subscribed via source and target branches