Switch from Fedora10 to Fedora15.

install/descriptors-sh.xml

@@ -7,7 +7,7 @@
     <value>ping,ssh,isup,linktest</value>
   </attribute>
   <attribute name="version">
-    <value>8</value>
+    <value>15</value>
   </attribute>
   <attribute name="reboot_waittime">
     <value>120</value>
@@ -34,7 +34,7 @@
     <value>Fedora</value>
   </attribute>
   <attribute name="nextosid">
-    <value>emulab-ops,FEDORA8-OVZ-STD</value>
+    <value>emulab-ops,FEDORA15-OPENVZ-STD</value>
   </attribute>
 </osid>
 <image>
@@ -42,22 +42,22 @@
     <value>1</value>
   </attribute>
   <attribute name="version">
-    <value>8</value>
+    <value>15</value>
   </attribute>
   <attribute name="osfeatures">
     <value>ping,ssh,ipod,isup,veths,veth-ne,mlinks,linktest,linkdelays,vlans,suboses</value>
   </attribute>
   <attribute name="path">
-    <value>/usr/testbed/images/FEDORA8-OVZ-STD.ndz</value>
+    <value>/usr/testbed/images/FEDORA15-OPENVZ-STD.ndz</value>
   </attribute>
   <attribute name="mbr_version">
-    <value>1</value>
+    <value>2</value>
   </attribute>
   <attribute name="loadpart">
     <value>2</value>
   </attribute>
   <attribute name="description">
-    <value>Standard Fedora8 image with support for OpenVZ vnodes.</value>
+    <value>Standard Fedora15 image with support for OpenVZ vnodes.</value>
   </attribute>
   <attribute name="op_mode">
     <value>NORMALv2</value>
@@ -66,7 +66,7 @@
     <value>0</value>
   </attribute>
   <attribute name="imagename">
-    <value>FEDORA8-OVZ-STD</value>
+    <value>FEDORA15-OPENVZ-STD</value>
   </attribute>
   <attribute name="pid">
     <value>emulab-ops</value>

install/genirack-nodetype.xml

@@ -16,10 +16,11 @@
 <attribute name="attr_integer_bootdisk_unit">  <value>0</value></attribute>
 <attribute name="attr_string_control_interface">  <value>eth0</value></attribute>
 <attribute name="attr_integer_control_network">  <value>0</value></attribute>
-<attribute name="attr_string_default_osid">  <value>emulab-ops,FEDORA10-STD</value></attribute>
+<attribute name="attr_string_default_osid">  <value>emulab-ops,FEDORA15-STD</value></attribute>
 <attribute name="attr_string_delay_osid">  <value>emulab-ops,FBSD82-STD</value></attribute>
 <attribute name="attr_integer_delay_capacity">  <value>1</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></value></attribute>
 <attribute name="attr_float_disksize">  <value>476.908</value></attribute>
 <attribute name="attr_string_disktype">  <value>da</value></attribute>
 <attribute name="attr_integer_frequency">  <value>2666</value></attribute>
@@ -31,8 +32,8 @@
 <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>400000</value></attribute>
-<attribute name="attr_integer_virtnode_capacity">  <value>0</value></attribute>
-<attribute name="attr_string_default_imageid">  <value>emulab-ops:FBSD82-STD,emulab-ops:FEDORA10-STD</value></attribute>
+<attribute name="attr_integer_virtnode_capacity">  <value>50</value></attribute>
+<attribute name="attr_string_default_imageid">  <value>emulab-ops:FBSD82-STD,emulab-ops:FEDORA15-STD</value></attribute>
 <attribute name="attr_boolean_has_management_iface">  <value>1</value></attribute>
 <attribute name="attr_string_management_iface_type">  <value>ilo</value></attribute>
 <attribute name="attr_boolean_add_management_iface">  <value>1</value></attribute>