Commit 98ea85cf authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Change default OSID to UBUNTU14-64-STD.

parent fc122c90
......@@ -30,7 +30,7 @@
<attribute name="attr_boolean_rebootable"> <value>1</value></attribute>
<attribute name="attr_integer_simnode_capacity"> <value>0</value></attribute>
<attribute name="attr_integer_trivlink_maxspeed"> <value>1000000</value></attribute>
<attribute name="attr_integer_virtnode_capacity"> <value>100</value></attribute>
<attribute name="attr_integer_virtnode_capacity"> <value>50</value></attribute>
<attribute name="attr_integer_virtnode_disksize"> <value>4096</value></attribute>
<attribute name="attr_boolean_has_management_iface"> <value>1</value></attribute>
<attribute name="attr_string_management_iface_type"> <value>ilo3</value></attribute>
......
<nodetype>
<attribute name="node_type"> <value>dl360</value></attribute>
<attribute name="attr_string_adminmfs_osid"> <value>emulab-ops,FREEBSD-MFS</value></attribute>
<attribute name="attr_string_default_osid"> <value>emulab-ops,FEDORA15-STD</value></attribute>
<attribute name="attr_string_default_osid"> <value>emulab-ops,UBUNTU14-64-STD</value></attribute>
<attribute name="attr_string_delay_osid"> <value>emulab-ops,FBSD82-STD</value></attribute>
<attribute name="attr_string_diskloadmfs_osid"> <value>emulab-ops,FRISBEE-MFS</value></attribute>
<attribute name="attr_string_jail_osid"> <value>emulab-ops,FEDORA15-STD</value></attribute>
......
......@@ -38,8 +38,8 @@ if ($FBSD_MAJOR >= 10) {
$PORTSRC = "http://www.emulab.net/downloads/FreeBSD-10.0-ports.tar.gz";
}
my $ZZZ = "/usr/local/etc/rc.d/zzz-inelab.sh";
my $DEFAULTOSID = "FEDORA15-STD";
my @EXPORTEDOSIDS= ("FBSD82-STD", "UBUNTU12-64-STD");
my $DEFAULTOSID = "UBUNTU14-64-STD";
my @EXPORTEDOSIDS= ("FBSD82-STD", "UBUNTU12-64-STD", "UBUNTU14-64-STD");
my $PGOSSITEVAR = "protogeni/default_osname";
my $CHPASS = "/usr/bin/chpass";
my $SSHTB = "$PREFIX/bin/sshtb";
......
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