X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=726749b725289081fa841c8eff0a68a24e3cc4bc;hb=139998a92ccaebe25b37a2ae5d9fefb2a381ee0a;hp=7a59c9df2c8892bd2e5ddfa76ee1869618cd656b;hpb=5b43ff1334e3b05809f742323bf867b8aa022dab;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index 7a59c9d..726749b 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -116,6 +116,68 @@ $URL$
 	  <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>
 
@@ -161,6 +223,22 @@ $URL$
       </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
@@ -554,6 +632,60 @@ $URL$
       </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>
@@ -567,6 +699,7 @@ $URL$
         </variable>
       </variablelist>
     </category>
+
     <category id="plc_monitor">
       <name>Monitoring Service</name>
       <description>The Monitor service that tracks node availablity and repair.</description>