launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/maas_import_isos into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/maas_import_isos/+merge/98532
-- 
https://code.launchpad.net/~andreserl/maas/maas_import_isos/+merge/98532
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/maas_import_isos into lp:maas.

=== modified file 'etc/maas/import_isos'
--- etc/maas/import_isos	2012-02-29 22:22:50 +0000
+++ etc/maas/import_isos	2012-03-20 22:32:29 +0000
@@ -4,7 +4,8 @@
 #PRIORITY="critical"
 #LOCALE="en_US"
 #INTERFACE="eth0"
-#KOPTS="priority=$PRIORITY locale=$LOCALE netcfg/choose_interface=$INTERFACE"
+#CONSOLE="ttyS0,9600n8"
+#KOPTS="priority=$PRIORITY locale=$LOCALE netcfg/choose_interface=$INTERFACE console=$CONSOLE"
 ## Juju Management Classes
 #MGMTCLASS_AVAILABLE="maas-juju-available"
 #MGMTCLASS_ACQUIRED="maas-juju-acquired"

=== modified file 'scripts/maas-import-isos'
--- scripts/maas-import-isos	2012-03-19 03:14:40 +0000
+++ scripts/maas-import-isos	2012-03-20 22:32:29 +0000
@@ -37,7 +37,8 @@
 [ -n "$PRIORITY" ] || PRIORITY="critical"
 [ -n "$LOCALE" ] || LOCALE="en_US"
 [ -n "$INTERFACE" ] || INTERFACE="auto"
-[ -n "$KOPTS" ] || KOPTS="priority=$PRIORITY locale=$LOCALE netcfg/choose_interface=$INTERFACE"
+[ -n "$CONSOLE" ] || CONSOLE="ttyS0,9600n8"
+[ -n "$KOPTS" ] || KOPTS="priority=$PRIORITY locale=$LOCALE netcfg/choose_interface=$INTERFACE console=$CONSOLE"
 [ -n "$ENLIST_PROFILE" ] || ENLIST_PROFILE="maas-enlist"
 if [ -n "$SERVER_IP" ]; then
 	KOPTS="$KOPTS log_host=$SERVER_IP log_port=514"
@@ -108,9 +109,9 @@
 
         # Add enlist profile
         if cobbler profile list | grep -qs " $ENLIST_PROFILE"; then
-                cobbler profile edit --name="$ENLIST_PROFILE" --parent="$PARENT_PROFILE"
+                cobbler profile edit --name="$ENLIST_PROFILE" --parent="$PARENT_PROFILE" --kopts="$KOPTS" --kickstart="$KSDIR/maas-enlist.preseed"
         else
-                cobbler profile add --name="$ENLIST_PROFILE" --parent="$PARENT_PROFILE" --kickstart="$KSDIR/maas-enlist.preseed"
+                cobbler profile add --name="$ENLIST_PROFILE" --parent="$PARENT_PROFILE" --kopts="$KOPTS" --kickstart="$KSDIR/maas-enlist.preseed"
         fi
 
         # Add 'default' system if doesn't exist.