X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=68c47a54219f3a363858d00be8c28d39056e0c94;hb=04b9869ff251c1eacc2f2875f96a4baeca185606;hp=af26a4b36d69945bac78624c8004681629416de1;hpb=f6b6f27990865d9edbc3aecc819abb0f0cbb12ec;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index af26a4b..68c47a5 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -39,7 +39,7 @@ Copyright (C) 2006 The Trustees of Princeton University
 	<variable id="hrn_root" type="string">
 	  <name>Root in Hierarchical Naming Space </name>
 	  <value>planetlab.test</value>
-	  <description> The root of this peer in the hierarchical federation naming space.</description>
+	  <description> The root of this peer in the hierarchical federation naming space. if SFA services are setup on top of this PLC deplyment, the SFA_INTERFACE_HRN needs to be equal to PLC_HRN_ROOT</description>
 	</variable>
 
 	<variable id="slice_prefix" type="string">
@@ -123,6 +123,20 @@ Copyright (C) 2006 The Trustees of Princeton University
       <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>
@@ -659,25 +673,6 @@ Copyright (C) 2006 The Trustees of Princeton University
           <description>The fully qualified hostname of the XMPP server.</description>
         </variable>
 
-        <variable id="xmpp_user" type="string">
-          <name>XMPP username</name>
-          <value></value>
-          <description>XMPP username (which has admin rights).</description>
-        </variable>
-
-        <variable id="xmpp_password" type="string">
-          <name>XMPP password</name>
-          <value></value>
-          <description>The password of the XMPP user.</description>
-        </variable>
-
-        <!-- omf-slicemgr -->
-        <variable id="slicemgr_url" type="string">
-          <name>OMF Slicemgr URL</name>
-          <value>http://localhost.localdomain:5053</value>
-          <description>.</description>
-        </variable>
-
       </variablelist>
     </category>
 
@@ -864,7 +859,8 @@ Copyright (C) 2006 The Trustees of Princeton University
       <variablelist>
 	<variable id="defaults" type="string">
 	  <name>vsys tags set by default</name>
-	  <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>
+	  <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>