3-fold nodefamily now has fcdistro as well

[myplc.git] / default_config.xml

diff --git a/default_config.xml b/default_config.xml
index 48a7f03..ae4f5e1 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -119,17 +119,72 @@ $URL$
       </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>
+
     <category id="plc_net">
       <name>Network</name>
       <description>Network environment.</description>
 
       <variablelist>
-        <variable id="enabled" type="boolean">
-          <name>Enable network configuration</name>
-          <value>true</value>
-          <description>Let PLC manage /etc/hosts</description>
-        </variable>
-
        <variable id="dns1" type="ip">
          <name>Primary DNS Server</name>
          <value>127.0.0.1</value>
@@ -167,6 +222,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