X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=94d4ab51da2a75b60bc89cea91d5cc60f9447304;hb=0e19db34c9647c1264874b889118923d7c2036b6;hp=84bdabfe7d5a7599f6549b521e0af97395b68bde;hpb=c46b69134aaca38070f75f4a993c6246c5cfe0c0;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index 84bdabf..94d4ab5 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -7,6 +7,7 @@ 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">
@@ -115,6 +116,68 @@ $Id$
 	  <description>The SSH private key used to access the root
 	  account on your nodes.</description>
 	</variable>
+
+      </variablelist>
+    </category>
+
+    <category id="plc_flavour">
+      <name>Flavours</name>
+      <description>Defaults for nodes and slices contents.</description>
+      
+      <variablelist>
+	<variable id="node_arch" type="string">
+	  <name>arch for nodes</name>
+	  <value>@ARCH@</value>
+	  <description>The default 'arch' to use when installing nodes.
+	  This is offered mostly for consistency with the rest of the
+	  PLC_FLAVOUR category, but does not have much of a practical
+	  interest. In any case, you need to have the corresponding
+	  bootstrapfs images available for nodes.</description>
+	</variable>
+
+	<variable id="node_fcdistro" type="string">
+	  <name>fcdistro for nodes</name>
+	  <value>@FCDISTRO@</value>
+	  <description>THIS CURRENTLY HAS NO EFFECT.
+          The default 'fcdistro' to use when installing
+	  nodes.You need to have the corresponding bootstrapfs images
+	  available for nodes. THIS CURRENTLY HAS NO EFFECT.</description>
+	</variable>
+
+	<variable id="node_pldistro" type="string">
+	  <name>pldistro for nodes</name>
+	  <value>@PLDISTRO@</value>
+	  <description>The default 'pldistro' to use when installing
+	  nodes. You need to have the corresponding bootstrapfs
+	  images available for nodes.</description>
+	</variable>
+
+	<variable id="slice_arch" type="string">
+	  <name>arch for slivers</name>
+	  <value>@ARCH@</value>
+	  <description>The default 'arch' to use for slivers. This is
+	  useful if you have heterogeneous nodes (i686 and x86_64),
+	  but want slivers to be homogeneous. You need to have the
+	  corresponding vserver variant rpm available for
+	  nodes.</description>
+	</variable>
+
+	<variable id="slice_fcdistro" type="string">
+	  <name>fcdistro for slivers</name>
+	  <value>@FCDISTRO@</value>
+	  <description>The default 'fcdistro' to use for creating
+	  slivers. You need to have the corresponding vserver variant
+	  rpm available for nodes.</description>
+	</variable>
+
+	<variable id="slice_pldistro" type="string">
+	  <name>pldistro for slivers</name>
+	  <value>@PLDISTRO@</value>
+	  <description>The default 'pldistro' to use for creating
+	  slivers. You need to have the corresponding vserver variant
+	  rpm available for nodes.</description>
+	</variable>
+
       </variablelist>
     </category>
 
@@ -160,6 +223,22 @@ $Id$
       </variablelist>
     </category>
 
+    <category id="plc_hosts">
+      <name>/etc/hosts</name>
+      <description>MyPLC can setup /etc/hosts with the hostnames and
+      IP addresses specified for *_NAME and *_IP, or look up the IP
+      addresses if they are not specified in this configuration.
+      </description>
+
+      <variablelist>
+        <variable id="enabled" type="boolean">
+          <name>Enable /etc/hosts configuration</name>
+          <value>true</value>
+          <description>Let PLC manage /etc/hosts</description>
+        </variable>
+      </variablelist>
+    </category>
+
     <category id="plc_mail">
       <name>Mail</name>
       <description>Many maintenance scripts, as well as the API and
@@ -553,6 +632,72 @@ $Id$
       </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>
+      <variablelist>
+        <variable id="enabled" type="boolean">
+          <name>OMF integration</name>
+          <value>false</value>
+          <description>Enable OMF integration.</description>
+        </variable>
+
+        <!-- xmpp server configuration -->
+        <variable id="xmpp_server" type="string">
+          <name>XMPP server</name>
+          <value>localhost.localdomain</value>
+          <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>
+
+    <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>
 
     <category id="plc_planetflow">
       <name>PlanetFlow Service Configuration</name>
@@ -566,6 +711,7 @@ $Id$
         </variable>
       </variablelist>
     </category>
+
     <category id="plc_monitor">
       <name>Monitoring Service</name>
       <description>The Monitor service that tracks node availablity and repair.</description>
@@ -600,6 +746,21 @@ $Id$
           <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>
@@ -656,13 +817,13 @@ $Id$
         <variable id="cc_address" type="email">
           <name>CC Email Address</name>
           <value>root+cclist@localhost.localdomain</value>
-          <description>All messages from Monitor will be copied to this address.</description>
+          <description>All messages to and from PLCRT will be copied to this address.</description>
         </variable>
         <variable id="web_user" type="string">
           <name>root</name>
           <value>root</value>
           <description>Username of a privileged user in RT who can create
-		  tickets in the queue named PLC_MONITOR_RT_QUEUE.</description>
+		  tickets for any RT Queue.</description>
         </variable>
         <variable id="web_password" type="password">
           <name>password</name>
@@ -676,6 +837,27 @@ $Id$
         </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>
   </variables>
 
   <comps>