Skip to content

GitLab

Commit 40b6e0a5 authored by Mike Hibler's avatar Mike Hibler
Browse files
Options

Bug Fix: image related changes for new release.

parent 3e44bb5f
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 4 deletions
install/descriptors-v4.xml 0 → 100644
View file @ 40b6e0a5
<descriptors>
<mapping name="RHL-STD">
<value>FEDORA15-STD</value>
</mapping>
<mapping name="FBSD-STD">
<value>FBSD83-STD</value>
</mapping>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>Frisbee (FreeBSD) in an MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>RELOAD</value></attribute>
<attribute name="osname"><value>FRISBEE-MFS</value></attribute>
<attribute name="path"><value>/tftpboot/frisbee</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>6.2</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>FreeBSD on the Operations Node</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>OPSNODEBSD</value></attribute>
<attribute name="osname"><value>OPSNODE-BSD</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>4.X</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>IPTables Firewall</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup,veths,linktest</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="nextosid"><value>emulab-ops,UBUNTU10-STD-FW</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osname"><value>FW-IPTABLES</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>120</value></attribute>
<attribute name="shared"><value>1</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Other</value></attribute>
<attribute name="description"><value>Stub descriptor for power controllers of any kind</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>ALWAYSUP</value></attribute>
<attribute name="osname"><value>POWER-CONTROLLER</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>60</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>0.00</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>Any Version of FreeBSD</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup,veths,veth-ne,veth-en,mlinks,linktest,linkdelays,vlans</value></attribute>
<attribute name="magic"><value>FreeBSD</value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>NORMAL</value></attribute>
<attribute name="osname"><value>FBSD-STD</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>NewNode (FreeBSD) in an MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>PXEFBSD</value></attribute>
<attribute name="osname"><value>NEWNODE-MFS</value></attribute>
<attribute name="path"><value>boss:/tftpboot/freebsd.newnode</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>6.2</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Any of RedHat Linux</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup,linktest,linkdelays,vlans</value></attribute>
<attribute name="magic"><value>Linux</value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>NORMAL</value></attribute>
<attribute name="osname"><value>RHL-STD</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>FreeBSD in an MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>PXEFBSD</value></attribute>
<attribute name="osname"><value>FREEBSD-MFS</value></attribute>
<attribute name="path"><value>/tftpboot/freebsd</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>6.2</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>64-bit Frisbee (FreeBSD) MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>RELOAD</value></attribute>
<attribute name="osname"><value>FRISBEE-64-MFS</value></attribute>
<attribute name="path"><value>/tftpboot/frisbee-64</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>8.3</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>64-bit Admin (FreeBSD) MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>PXEFBSD</value></attribute>
<attribute name="osname"><value>FREEBSD-64-MFS</value></attribute>
<attribute name="path"><value>/tftpboot/freebsd-64</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>8.3</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>64-bit NewNode (FreeBSD) MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>PXEFBSD</value></attribute>
<attribute name="osname"><value>NEWNODE-64-MFS</value></attribute>
<attribute name="path"><value>/tftpboot/freebsd.newnode-64</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>8.3</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Linux incarnation of the admin MFS</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>PXEFBSD</value></attribute>
<attribute name="osname"><value>ADMIN-LINUX</value></attribute>
<attribute name="path"><value>/tftpboot/admin_linux</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>120</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>2.6.27.8</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Linux incarnation of the newnode MFS</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>PXEFBSD</value></attribute>
<attribute name="osname"><value>NEWNODE-LINUX</value></attribute>
<attribute name="path"><value>boss:/tftpboot/frisbee_linux/vmlinuz initrd=/tftpboot/frisbee_linux/initramfs.gz console=tty0 console=ttyS0,115200 elab_mode=newnode</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>120</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>2.6.27.8</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Linux-based frisbee initramfs</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mfs"><value>1</value></attribute>
<attribute name="mustclean"><value>0</value></attribute>
<attribute name="op_mode"><value>RELOAD</value></attribute>
<attribute name="osname"><value>FRISBEE-LINUX</value></attribute>
<attribute name="path"><value>/frisbee_linux</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>2.6.27.8</value></attribute>
</osid>
<image>
<attribute name="OS"><value>Fedora</value></attribute>
<attribute name="description"><value>Standard 32-bit Fedora 15 image</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>FEDORA15-STD</value></attribute>
<attribute name="loadpart"><value>2</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,linktest,vlans</value></attribute>
<attribute name="path"><value>/usr/testbed/images/FEDORA15-STD.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>15</value></attribute>
</image>
<image>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>FreeBSD 8.3 32-bit version</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>FBSD83-STD</value></attribute>
<attribute name="loadpart"><value>1</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,mlinks,linktest,vlans</value></attribute>
<attribute name="path"><value>/usr/testbed/images/FBSD83-STD.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>8.3</value></attribute>
</image>
<image>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Firewall image based on ubuntu 10</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>UBUNTU10-STD-FW</value></attribute>
<attribute name="loadpart"><value>2</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,linktest</value></attribute>
<attribute name="path"><value>/usr/testbed/images/UBUNTU10-STD-FW.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>10</value></attribute>
</image>
<image>
<attribute name="OS"><value>Fedora</value></attribute>
<attribute name="description"><value>Standard 64-bit Fedora 15 image</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>FEDORA15-64-STD</value></attribute>
<attribute name="loadpart"><value>2</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,linktest</value></attribute>
<attribute name="path"><value>/usr/testbed/images/FEDORA15-64-STD.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>15</value></attribute>
</image>
<image>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>FreeBSD 8.3 64-bit version </value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>FBSD83-64-STD</value></attribute>
<attribute name="loadpart"><value>1</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,mlinks,linktest,vlans</value></attribute>
<attribute name="path"><value>/usr/testbed/images/FBSD83-64-STD.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>8.3</value></attribute>
</image>
</descriptors>
install/dump-descriptors.in
View file @ 40b6e0a5
......@@ -39,10 +39,10 @@ sub usage()
print STDERR " -v 2 second generation STD images (FBSD62, FC6)\n";
print STDERR " -v 3 third generation STD images (FBSD82, FEDORA15)\n";
print STDERR " -v 4 fourth generation STD images (FBSD83, FEDORA15)\n";
print STDERR "Default version is 2.\n";
print STDERR "Default version is 4.\n";
exit(-1);
}
my $version = 2;
my $version = 4;
my $mfsonly = 0;
my $images;
......
install/phases/boss/images
View file @ 40b6e0a5
......@@ -24,6 +24,18 @@ sub Install($$$)
if ($PROTOGENI_GENIRACK) {
push(@STDIMAGES, "UBUNTU12-64-STD");
}
#
# XXX don't want to risk breaking GENIRACK, so only do this otherwise.
#
# XXX we should really download: FBSD83-64-STD, FEDORA15-64-STD,
# UBUNTU10-STD-FW, and the Linux MFSes that are also part of the
# default descriptors, but downloading images takes a long time
# so we keep the number of images to a minimum.
#
else {
@STDIMAGES = ("FBSD83-STD", "FEDORA15-STD");
$DESCRIPTORS = "$TOP_SRCDIR/install/descriptors-v4.xml";
}
Phase "IDs", "Setting up Images and OSs", sub {
if ($PROTOGENI_GENIRACK) {
......@@ -51,12 +63,12 @@ sub Install($$$)
# Load up the initial descriptors.
# Load up the images from boss.
#
Phase "descriptors", "Loading the Image and OS IDS", sub {
Phase "descriptors", "Loading the Image and OS IDs", sub {
ExecQuietFatal("cd $TOP_OBJDIR/install; ".
" $SUDO -u $PROTOUSER $WAP ".
" perl load-descriptors -a $DESCRIPTORS");
};
Phase "gendev", "Loading additional OS IDS", sub {
Phase "gendev", "Loading additional OS IDs", sub {
ExecQuietFatal("cd $TOP_OBJDIR/install; ".
" $SUDO -u $PROTOUSER $WAP ".
" perl load-descriptors $GENDEV");
......
sql/database-fill-supplemental.sql
View file @ 40b6e0a5
......@@ -20,6 +20,7 @@ INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','6.2','delay','/boot/kernel.pol
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','6.2','linkdelay','/boot/kernel/kernel HZ=1000');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','7.3','delay','/boot/kernel.poll/kernel HZ=10000');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','8.2','delay','/boot/kernel/kernel kern.hz=10000');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','8.3','delay','/boot/kernel/kernel kern.hz=10000');
INSERT IGNORE INTO os_boot_cmd VALUES ('Linux','9.0','linkdelay','linkdelay');
INSERT IGNORE INTO emulab_indicies (name,idx) VALUES ('cur_log_seq', 1);
......
sql/updates/4/336 0 → 100644
View file @ 40b6e0a5
#
# Updates to os_boot_cmd table.
#
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
DBQueryFatal("REPLACE INTO os_boot_cmd VALUES" .
" ('FreeBSD','8.3','delay','/boot/kernel/kernel kern.hz=10000')");
return 0;
}
1;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment