egrep is obsolete

[myplc.git] / default_config.xml

diff --git a/default_config.xml b/default_config.xml
index 94d4ab5..a88a180 100644 (file)
--- 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">
@@ -41,7 +39,7 @@ $URL$
        <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,8 +121,22 @@ $URL$
     <category id="plc_flavour">
       <name>Flavours</name>
       <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>
@@ -264,6 +276,16 @@ $URL$
          Tracker.</description>
        </variable>
 
+       <variable id="from_address" type="email">
+         <name>From Address</name>
+         <value>root@localhost.localdomain</value>
+         <description>All e-mail notifications and warnings will appear
+         to come from this address. Older versions used PLC_MAIL_SUPPORT_ADDRESS here.
+         Choosing a different address can be useful in a context where SPF is in place.
+         A good test is to try an enroll an account with a gmail account.
+         </description>
+       </variable>
+
        <variable id="boot_address" type="email">
          <name>Boot Messages Address</name>
          <value>root+install-msgs@localhost.localdomain</value>
@@ -390,14 +412,14 @@ $URL$
         <variable id="ipod_subnet" type="ip">
           <name>IP Subnet</name>
           <value>127.0.0.1</value>
-          <description>The IP Subnet for all API servers. 
+          <description>The IP Subnet for all API servers.
          Used to identify IPoD packet senders.</description>
         </variable>
 
         <variable id="ipod_mask" type="ip">
           <name>IP Mask</name>
           <value>255.255.255.255</value>
-          <description>The IP Mask that should be applied to incoming 
+          <description>The IP Mask that should be applied to incoming
          packets to match the IP Subnet for IPoD packets.</description>
         </variable>
 
@@ -661,25 +683,6 @@ $URL$
           <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>
 
@@ -837,6 +840,7 @@ $URL$
         </variable>
       </variablelist>
     </category>
+
     <category id="myslice">
       <name>MySlice</name>
       <description>MySlice configuration parameters</description>
@@ -858,6 +862,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>