X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=68c47a54219f3a363858d00be8c28d39056e0c94;hb=1e0e4007e306ca111f0d538c073fd51380abcd99;hp=b8a2b66629f263b98c495a8837459beaf0be27be;hpb=49ba90c5c9c2d8a7d81db679e709835b227c25bf;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index b8a2b66..68c47a5 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">
@@ -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">
@@ -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>
@@ -632,6 +644,18 @@ $URL$
       </variablelist>
     </category>
 
+    <category id="plc_ratelimit">
+      <name>Planetlab Ratelimit Settings</name>
+      <description>Planetlab Ratelimit Settings</description>
+      <variablelist>
+        <variable id="enabled" type="bolean">
+          <name>Enable Ratelimit</name>
+          <value>false</value>
+          <description>Enable Ratelimit for sites</description>
+        </variable>
+      </variablelist>
+    </category>
+
     <category id="plc_omf">
       <name>Planetlab - OMF Integration</name>
       <description>Planetlab - OMF integration</description>
@@ -649,25 +673,22 @@ $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>
+      </variablelist>
+    </category>
 
-        <!-- omf-slicemgr -->
-        <variable id="slicemgr_url" type="string">
-          <name>OMF Slicemgr URL</name>
-          <value>http://localhost.localdomain:5053/</value>
-          <description>.</description>
-        </variable>
+    <category id="plc_reservation">
+      <name> Reservable Nodes</name>
+      <description> Settings related to reservable nodes </description>
 
+      <variablelist>
+	<variable id="granularity" type="int">
+	  <name>Lease granularity</name>
+	  <value>3600</value>
+	  <description>The smallest timeslot that can be allocated to
+	  a node. All leases will be rounded to this granularity, so
+	  e.g. if you set 3600 all leases will start and stop at round
+	  hours.</description>
+	</variable>
       </variablelist>
     </category>
 
@@ -718,6 +739,21 @@ $URL$
           <value>support</value>
           <description>All messages from Monitor will be copied to this address.</description>
         </variable>
+        <variable id="dbhost" type="hostname">
+          <name>Database Hostname</name>
+          <value>localhost</value>
+          <description>The hostname for the monitor database.</description>
+        </variable>
+        <variable id="dbuser" type="string">
+          <name>Database User</name>
+          <value>monitoruser</value>
+          <description>The username for connecting to the monitor database.</description>
+        </variable>
+        <variable id="dbname" type="string">
+          <name>Database Name</name>
+          <value>monitor</value>
+          <description>Name of monitor database.</description>
+        </variable>
         <variable id="dbpassword" type="password">
           <name>Database Password</name>
           <value></value>
@@ -794,6 +830,40 @@ $URL$
         </variable>
       </variablelist>
     </category>
+
+    <category id="myslice">
+      <name>MySlice</name>
+      <description>MySlice configuration parameters</description>
+      <variablelist>
+	<variable id="comon_url" type="string">
+	  <name>comon</name>
+	  <value></value>
+	  <description>The address of the CoMon url that provides information for this PLC's nodes (if not the default http://comon.cs.princeton.edu/)</description>
+	</variable>
+	<variable id="comon_available" type="boolean">
+	  <name>comon</name>
+	  <value>false</value>
+	  <description>True, if comon data are available for this PLC's nodes</description>
+	</variable>
+	<variable id="tophat_available" type="boolean">
+	  <name>tophat</name>
+	  <value>false</value>
+	  <description>True, if tophat data are available for this PLC's nodes</description>
+	</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>