diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm index 7e2af1d21..817eac405 100755 --- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm +++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm @@ -718,9 +718,16 @@ sub update_tables_with_templates $genos =~ s/\..*//; if ($genos =~ /rh.*s(\d*)/) { $genos = "rhels$1"; + } elsif ($osver =~ /ubuntu/) { + # for Focal and later Ubuntu we repurpose genos to indicate the use + # of the subiquity installer + if ($osver =~ /ubuntu(\d+\.\d+)/) { + if ($1 >= 20.04) { + $genos = "subiquity"; + } + } } - #print "osver=$osver, arch=$arch, osname=$osname, genos=$genos\n"; my $installroot = xCAT::TableUtils->getInstallDir(); diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index cc265fabb..02b93ff1d 100644 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -164,6 +164,19 @@ sub using_dracut return 0; } +# Check whether the new subiquity installer is used by this os +sub using_subiquity +{ + my $os = shift; + if ($os =~ /ubuntu(\d+\.\d+)/) { + if ($1 >= 20.04) { + return 1; + } + } + + return 0; +} + sub copyAndAddCustomizations { my $source = shift; my $dest = shift; @@ -567,6 +580,12 @@ sub mkinstall { my $pltfrm = getplatform($ref->{'osvers'}); my $tmplfile = xCAT::SvrUtils::get_tmpl_file_name("$installroot/custom/install/$pltfrm", $ref->{'profile'}, $ref->{'osvers'}, $ref->{'osarch'}, $ref->{'osvers'}); + if (using_subiquity($os)) { + + # in this context we use the genos parameter to search for the subiquity template + $tmplfile = xCAT::SvrUtils::get_tmpl_file_name("$installroot/custom/install/$pltfrm", + $ref->{'profile'}, $ref->{'osvers'}, $ref->{'osarch'}, $ref->{'osvers'}, "subiquity"); + } if (!$tmplfile) { $tmplfile = xCAT::SvrUtils::get_tmpl_file_name("$::XCATROOT/share/xcat/install/$pltfrm", $ref->{'profile'}, $ref->{'osvers'}, $ref->{'osarch'}, $ref->{'osvers'}); @@ -716,9 +735,27 @@ sub mkinstall { $tmperr = "Unable to find template in $installroot/custom/install/$platform or $::XCATROOT/share/xcat/install/$platform (for $profile/$os/$arch combination)"; } if (-r "$tmplfile") { + my $autoinstfile = "$installroot/autoinst/" . $node; + + # handle nocloud-net datasource for ubuntu 20.04+ + if (using_subiquity($os)) { + + # clean up existing files to make way for the new directory + if (-f $autoinstfile) { + unlink($autoinstfile); + } + mkpath($autoinstfile); + + # create empty meta-data file + open(my $fh, ">", $autoinstfile . "/meta-data"); + close($fh); + + # point the template output at the /user-data file + $autoinstfile = "$autoinstfile/user-data"; + } $tmperr = xCAT::Template->subvars($tmplfile, - "$installroot/autoinst/" . $node, + $autoinstfile, $node, $pkglistfile, $pkgdir, @@ -728,7 +765,11 @@ sub mkinstall { ); } + # maybe Debian will decide to use subiquity at some point? my $prescript = "$::XCATROOT/share/xcat/install/scripts/pre.$platform"; + if (using_subiquity($os)) { + $prescript = $prescript . ".subiquity"; + } my $postscript = "$::XCATROOT/share/xcat/install/scripts/post.$platform"; # for powerkvm VM ubuntu LE# @@ -801,6 +842,16 @@ sub mkinstall { and $kernpath = "$pkgdir/install/netboot/vmlinuz" and -r "$pkgdir/install/netboot/initrd.gz" and $initrdpath = "$pkgdir/install/netboot/initrd.gz" + ) or + (-r "$pkgdir/casper/hwe-vmlinuz" + and $kernpath = "$pkgdir/casper/hwe-vmlinuz" + and -r "$pkgdir/casper/hwe-initrd" + and $initrdpath = "$pkgdir/casper/hwe-initrd" + ) or + (-r "$pkgdir/casper/vmlinuz" + and $kernpath = "$pkgdir/casper/vmlinuz" + and -r "$pkgdir/casper/initrd" + and $initrdpath = "$pkgdir/casper/initrd" ) ) ) or ( @@ -844,7 +895,12 @@ sub mkinstall { if ($docopy) { mkpath("$tftppath"); copy($kernpath, "$tftppath/vmlinuz"); - copyAndAddCustomizations($initrdpath, "$tftppath/initrd.img"); + # we don't want to customise the subiquity initrd + if (using_subiquity($os)) { + copy($initrdpath, "$tftppath/initrd.img"); + } else { + copyAndAddCustomizations($initrdpath, "$tftppath/initrd.img"); + } } # We have a shot... @@ -869,10 +925,32 @@ sub mkinstall { $instserver = $ent->{nfsserver}; } - my $kcmdline = "nofb utf8 auto url=http://" . $instserver . ":$httpport/install/autoinst/" . $node; + my $kcmdline = "nofb utf8 auto xcatd=" . $instserver; + + if (using_subiquity($os)) { + $kcmdline .= " autoinstall ip=dhcp netboot=nfs nfsroot=${instserver}:${pkgdir}"; + $kcmdline .= " ds=nocloud-net;s=http://${instserver}:${httpport}/install/autoinst/${node}/"; + } else { + $kcmdline .= " url=http://${instserver}:$httpport/install/autoinst/$node"; + $kcmdline .= " mirror/http/hostname=${instserver}:$httpport"; + + # default answers as much as possible, we don't want any interactiveness :) + $kcmdline .= " priority=critical"; + + # parse Mac table to get one mac address in case there are multiples. + my $net_params = xCAT::NetworkUtils->gen_net_boot_params($ent->{installnic}, $ent->{primarynic}, $mac); + if (exists($net_params->{nicname})) { + $kcmdline .= " netcfg/choose_interface=" . $net_params->{nicname}; + } elsif (exists($net_params->{mac})) { + $kcmdline .= " netcfg/choose_interface=" . $net_params->{mac}; + } + + #from 12.10, the live install changed, so add the live-installer + if (-r "$pkgdir/install/filesystem.squashfs") { + $kcmdline .= " live-installer/net-image=http://${instserver}:$httpport${pkgdir}/install/filesystem.squashfs"; + } + } - $kcmdline .= " xcatd=" . $instserver; - $kcmdline .= " mirror/http/hostname=" . $instserver.":$httpport"; if ($maxmem) { $kcmdline .= " mem=$maxmem"; } @@ -883,13 +961,6 @@ sub mkinstall { $mac = xCAT::Utils->parseMacTabEntry($macent->{mac}, $node); } - my $net_params = xCAT::NetworkUtils->gen_net_boot_params($ent->{installnic}, $ent->{primarynic}, $mac); - if (exists($net_params->{nicname})) { - $kcmdline .= " netcfg/choose_interface=" . $net_params->{nicname}; - } elsif (exists($net_params->{mac})) { - $kcmdline .= " netcfg/choose_interface=" . $net_params->{mac}; - } - #TODO: dd= for driver disks if (defined($sent->{serialport})) { unless ($sent->{serialspeed}) { @@ -913,9 +984,6 @@ sub mkinstall { #$kcmdline .= " netcfg/wireless_wep= netcfg/get_hostname= netcfg/get_domain="; - # default answers as much as possible, we don't want any interactiveness :) - $kcmdline .= " priority=critical"; - # Automatically detect all HDD # $kcmdline .= " all-generic-ide irqpoll"; @@ -931,11 +999,6 @@ sub mkinstall { # safer way to set hostname, avoid problems with nameservers $kcmdline .= " hostname=" . $node; - #from 12.10, the live install changed, so add the live-installer - if (-r "$pkgdir/install/filesystem.squashfs") { - $kcmdline .= " live-installer/net-image=http://${instserver}:$httpport${pkgdir}/install/filesystem.squashfs"; - } - xCAT::MsgUtils->trace($verbose_on_off, "d", "debian->mkinstall: kcmdline=$kcmdline kernal=$rtftppath/vmlinuz initrd=$rtftppath/initrd.img"); $bootparams->{$node}->[0]->{kernel} = "$rtftppath/vmlinuz"; $bootparams->{$node}->[0]->{initrd} = "$rtftppath/initrd.img"; diff --git a/xCAT-server/share/xcat/install/scripts/getinstdisk b/xCAT-server/share/xcat/install/scripts/getinstdisk index f5586c14d..0c68ebeca 100644 --- a/xCAT-server/share/xcat/install/scripts/getinstdisk +++ b/xCAT-server/share/xcat/install/scripts/getinstdisk @@ -58,9 +58,9 @@ if [ -z "$install_disk" ]; then dev_type=$(udevadm info --query=property --name=/dev/$entry | grep -i "DEVTYPE" | awk -F = '{print $2}' | $utolcmd) fi - if [ "$dev_type" == "disk" ]; then + if [ "$dev_type" = "disk" ]; then disks=$disks"$entry " - elif [ "$dev_type" == "partition" ]; then + elif [ "$dev_type" = "partition" ]; then partitions=$partitions"$entry " fi done diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.subiquity b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.subiquity new file mode 100644 index 000000000..d66b59280 --- /dev/null +++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.subiquity @@ -0,0 +1,270 @@ +export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#" +if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then + set -x +fi + +#!/bin/sh + +# syslog is probably running from the syslog.socket service +systemctl stop syslog.socket +systemctl stop rsyslog +# however, lets make sure . . . +[ -e /var/run/rsyslogd.pid ] && kill -TERM $(cat /var/run/rsyslogd.pid) +# bare minimum rsyslog.conf to support UDP forwarding +cat < /tmp/rsyslog.conf +module(load="imuxsock") +module(load="imklog" permitnonkernelfacility="on") +*.* @#XCATVAR:XCATMASTER# +EOF +rsyslogd -f /tmp/rsyslog.conf +log_label="xcat.deployment" +logger -t $log_label -p "info" "============deployment starting============" +logger -t $log_label -p "info" "Running preseeding early_command Installation script..." +if [ ! -c /dev/vcs ]; then + mknod /dev/vcs c 7 0 +fi + +cat >/tmp/foo.sh </dev/null) + + if [ -z "\$output" ]; then + output="installing prep" + fi + + echo "\$output" + ;; +esac + +exit 0 +EOF + +chmod 755 /tmp/foo.sh + +/tmp/foo.sh >/tmp/foo.log 2>&1 & + +base64decode() +{ + h0="0"; h1="1"; h2="2"; h3="3"; h4="4"; h5="5"; h6="6"; h7="7"; + h8="8"; h9="9"; h10="A"; h11="B"; h12="C"; h13="D"; h14="E"; h15="F"; + + while : + do + i=0 + while [ "$i" -lt 4 ] + do + read -n 1 c || return + + case "${c}" in + "A") d=0 ;; "B") d=1 ;; "C") d=2 ;; "D") d=3 ;; + "E") d=4 ;; "F") d=5 ;; "G") d=6 ;; "H") d=7 ;; + "I") d=8 ;; "J") d=9 ;; "K") d=10 ;; "L") d=11 ;; + "M") d=12 ;; "N") d=13 ;; "O") d=14 ;; "P") d=15 ;; + "Q") d=16 ;; "R") d=17 ;; "S") d=18 ;; "T") d=19 ;; + "U") d=20 ;; "V") d=21 ;; "W") d=22 ;; "X") d=23 ;; + "Y") d=24 ;; "Z") d=25 ;; "a") d=26 ;; "b") d=27 ;; + "c") d=28 ;; "d") d=29 ;; "e") d=30 ;; "f") d=31 ;; + "g") d=32 ;; "h") d=33 ;; "i") d=34 ;; "j") d=35 ;; + "k") d=36 ;; "l") d=37 ;; "m") d=38 ;; "n") d=39 ;; + "o") d=40 ;; "p") d=41 ;; "q") d=42 ;; "r") d=43 ;; + "s") d=44 ;; "t") d=45 ;; "u") d=46 ;; "v") d=47 ;; + "w") d=48 ;; "x") d=49 ;; "y") d=50 ;; "z") d=51 ;; + "0") d=52 ;; "1") d=53 ;; "2") d=54 ;; "3") d=55 ;; + "4") d=56 ;; "5") d=57 ;; "6") d=58 ;; "7") d=59 ;; + "8") d=60 ;; "9") d=61 ;; "+") d=62 ;; "/") d=63 ;; + "=") d=0 ;; + *) continue ;; + esac + + eval "a${i}=${c}" + eval "b${i}=${d}" + + i=$(( i + 1 )) + done + + o0=$(( ((b0 << 2) | (b1 >> 4)) & 0xff )) + o1=$(( ((b1 << 4) | (b2 >> 2)) & 0xff )) + o2=$(( ((b2 << 6) | b3) & 0xff )) + + [ "${a2}" == "=" ] && + eval "printf \"\\x\${h$(( o0 / 16 ))}\${h$(( o0 % 16 + ))}\"" && + return + [ "${a3}" == "=" ] && + eval "printf \"\\x\${h$(( o0 / 16 ))}\${h$(( o0 % 16 + ))}\\x\${h$(( o1 / 16 ))}\${h$(( o1 % 16 + ))}\"" && + return + eval "printf \"\\x\${h$(( o0 / 16 ))}\${h$(( o0 % 16 + ))}\\x\${h$(( o1 / 16 ))}\${h$(( o1 % 16 + ))}\\x\${h$(( o2 / 16 ))}\${h$(( o2 % 16 ))}\"" + done +} +# Note that the subiquity/curtin installation config is fairly picky about +# the order in which things are specified - you have to specify all the +# partitions before you can specify any filesystems, which means this is +# hard to stitch together piecemeal. Instead we just do everything in +# separate blocks . . . +# +# Also note that only /one/ partition can be given a variable size, and it +# must be the last partition on the disk - this forces us to put swap before +# the main root partition, and forces us to have a fixed size swap partition +# +# Also, the autoinstall.yaml file that this needs to be appended to is a +# modified cloud-init.conf file, with the top level elided - hence the +# storage block below needs to start with no indentation. +logger -t $log_label -p "info" "Generate partition file..." +if [ -e /tmp/xcat.install_disk ]; then + INSTALL_DISK=$(cat /tmp/xcat.install_disk) +else + logger -t $log_label -p "err" "Failed to find partition file - getinstdisk must be run first" + logger -t $log_label -p "err" "Using fallback default disk /dev/sda" + INSTALL_DISK="/dev/sda" +fi + +if [ -d /sys/firmware/efi ]; then + cat </tmp/partitionfile +storage: + config: + - {id: disk-detected, ptable: gpt, path: $INSTALL_DISK, wipe: superblock, + preserve: false, name: '', grub_device: true, type: disk} + - {id: efi-part, device: disk-detected, size: 512MB, flag: boot, + type: partition, preserve: false} + - {id: swap-part, device: disk-detected, size: 2GB, flag: swap, + type: partition, preserve: false} + - {id: root-part, device: disk-detected, size: -1, type: partition, + preserve: false} + - {id: efi-part-fs, volume: efi-part, type: format, fstype: fat, label: efi} + - {id: swap-part-fs, volume: swap-part, type: format, fstype: swap} + - {id: root-part-fs, volume: root-part, type: format, fstype: ext4, + label: root} + - {id: efi-part-mount, device: efi-part-fs, type: mount, path: /boot/efi} + - {id: swap-part-mount, device: swap-part-fs, type: mount, path: none} + - {id: root-part-mount, device: root-part-fs, type: mount, path: /} +EOF +else + cat </tmp/partitionfile +storage: + config: + - {id: disk-detected, ptable: msdos, path: $INSTALL_DISK, wipe: superblock, + preserve: false, name: '', grub_device: true, type: disk} + - {id: boot-part, device: disk-detected, size: 512MB, flag: boot, + type: partition, preserve: false} + - {id: swap-part, device: disk-detected, size: 2GB, flag: swap, + type: partition, preserve: false} + - {id: root-part, device: disk-detected, size: -1, type: partition, + preserve: false} + - {id: boot-part-fs, volume: boot-part, type: format, fstype: ext4, label: boot} + - {id: swap-part-fs, volume: swap-part, type: format, fstype: swap} + - {id: root-part-fs, volume: root-part, type: format, fstype: ext4, + label: root} + - {id: boot-part-mount, device: boot-part-fs, type: mount, path: /boot} + - {id: swap-part-mount, device: swap-part-fs, type: mount, path: none} + - {id: root-part-mount, device: root-part-fs, type: mount, path: /} +EOF +fi + +#XCA_PARTMAN_RECIPE_SCRIPT# +#XCA_PARTMAN_DISK_SCRIPT# +#XCA_PARTMAN_ADDITIONAL_CONFIG_SCRIPT# +exit 0 + +if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then +then + set +x +fi diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.subiquity.tmpl b/xCAT-server/share/xcat/install/ubuntu/compute.subiquity.tmpl new file mode 100644 index 000000000..f2f45fe83 --- /dev/null +++ b/xCAT-server/share/xcat/install/ubuntu/compute.subiquity.tmpl @@ -0,0 +1,77 @@ +#cloud-config +autoinstall: + version: 1 + keyboard: {layout: us, toggle: null, variant: ''} + locale: en_US + network: + version: 2 + ethernets: + '#TABLE:noderes:$NODE:installnic#': + dhcp4: true + ssh: + allow-pw: true + authorized-keys: [] + install-server: true + apt: + primary: + - arches: [amd64, i386] + uri: https://mirror.pnl.gov/ubuntu/ + user-data: + hostname: #HOSTNAME# + disable_root: false + package_update: true + package_upgrade: true + timezone: #TABLE:site:key=timezone:value# + chpasswd: + list: + - root:#CRYPT:passwd:key=system,username=root:password# + packages: + - bash + - nfs-common + - openssl + - isc-dhcp-client + - libc-bin + - openssh-server + - openssh-client + - wget + - vim + - rsync + - busybox-static + - gawk + - dnsutils + - chrony + - gpg + early-commands: + - '{ + echo "Running install disk detection..."; + wget http://#XCATVAR:XCATMASTER##COLONHTTPPORT#/install/autoinst/getinstdisk; + chmod u+x ./getinstdisk; + ./getinstdisk; + echo "Running early_command Installation script..."; + wget http://#XCATVAR:XCATMASTER##COLONHTTPPORT#/install/autoinst/#HOSTNAME#.pre; + chmod u+x #HOSTNAME#.pre; + ./#HOSTNAME#.pre; + echo "Updating storage config..."; + cat /autoinstall.yaml |head -n -1 > /tmp/autoinstall.yaml; + cat /tmp/partitionfile >> /tmp/autoinstall.yaml; + cat /tmp/autoinstall.yaml >/autoinstall.yaml; + echo "Disabling systemd-resolved..."; + rm -f /etc/resolv.conf; + echo "nameserver #TABLE:noderes:$NODE:xcatmaster#" >/etc/resolv.conf; + echo "domain #TABLE:site:key=domain:value#" >>/etc/resolv.conf; + } >>/tmp/pre-install.log' + late-commands: + - mkdir -p /target/var/log/xcat/ + - '{ + cat /tmp/pre-install.log >> /target/var/log/xcat/xcat.log; + echo "Updating kernel command line..."; + echo "GRUB_CMDLINE_LINUX=\"#TABLE:bootparams:$NODE:kcmdline#\"" >>/target/etc/default/grub; + curtin in-target --target /target update-grub2; + echo "Running late_command Installation script..."; + wget http://#XCATVAR:XCATMASTER##COLONHTTPPORT#/install/autoinst/#HOSTNAME#.post; + chmod u+x #HOSTNAME#.post; + cp ./#HOSTNAME#.post /target/root/post.script; + curtin in-target --target /target /root/post.script; + } >>/target/var/log/xcat/xcat.log 2>&1' + error-commands: + - tar -c --transform='s/^/#HOSTNAME#-logs\//' /var/crash /var/logs/installer |nc -l 8080 diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu20.04.x86_64.pkglist b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu20.04.x86_64.pkglist new file mode 100644 index 000000000..fa2437cfc --- /dev/null +++ b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu20.04.x86_64.pkglist @@ -0,0 +1,14 @@ +bash +nfs-common +openssl +isc-dhcp-client +libc-bin +openssh-server +openssh-client +wget +vim +rsync +busybox-static +gawk +dnsutils +chrony