X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=ede85b175b0604f033a3f401a44c6a113eb7a94e;hb=facac6604dd7a4dd781fff92ebf6f9cc3315ac33;hp=94d4ab51da2a75b60bc89cea91d5cc60f9447304;hpb=96b13f97bb0887cb858151265208f393c5fc495a;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index 94d4ab5..ede85b1 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -6,8 +6,6 @@ Default PLC configuration file
 Mark Huang <mlhuang@cs.princeton.edu>
 Copyright (C) 2006 The Trustees of Princeton University
 
-$Id$
-$URL$
 -->
 
 <!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
@@ -125,6 +123,20 @@ $URL$
       <description>Defaults for nodes and slices contents.</description>
       
       <variablelist>
+	<variable id="virt_map" type="string">
+	  <value> f8,f12,f14,centos5,centos6:vs; default:lxc </value>
+	  <description>Allows to compute a virtualization mechanism
+	  from an fcdistro. Starting with 5.2 MyPLC has support for
+	  either 'vs' or 'lxc', and this gives a correspondance from
+	  the node's fcdistro to the right virtualization mechanism.
+	  This information is essentially used by the BootManager for
+	  getting the installation phase right like e.g. when
+	  partitioning disks, and not to figure the contents of the
+	  nodeimage that depend only on fcdistro, pldistro and of
+	  course arch. This can be overridden by setting the vrt tag
+	  on that particular node. </description>
+	</variable>
+
 	<variable id="node_arch" type="string">
 	  <name>arch for nodes</name>
 	  <value>@ARCH@</value>
@@ -837,6 +849,7 @@ $URL$
         </variable>
       </variablelist>
     </category>
+
     <category id="myslice">
       <name>MySlice</name>
       <description>MySlice configuration parameters</description>
@@ -858,6 +871,18 @@ $URL$
 	</variable>
       </variablelist>
     </category>
+
+    <category id="plc_vsys">
+      <name>vsys</name>
+      <description>Default values for the vsys tag</description>
+      <variablelist>
+	<variable id="defaults" type="string">
+	  <name>vsys tags set by default</name>
+	  <value> </value>
+	  <description>Comma-separated list of vsys script names that all newly created slices will have as their vsys tags. For older slices, see the check-vsys-defaults.py script as part of the myplc package</description>
+	</variable>
+      </variablelist>
+    </category>
   </variables>
 
   <comps>