From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 25 Jan 2010 16:31:56 +0000 (+0000)
Subject: plc_flavour variables for bootstrapfs selection
X-Git-Tag: MyPLC-5.0-1^2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=70d06a0b50e8940352eec5844319ad2bcbb04a97;p=myplc.git

plc_flavour variables for bootstrapfs selection
---

diff --git a/Makefile b/Makefile
index efd49d0..82ae384 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ tags:
 # (*) otherwise, entering through the root context
 # make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
 
+PLCHOST ?= testplc.onelab.eu
+
 ifdef GUEST
-ifdef PLCHOST
 SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
 SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
 endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
diff --git a/default_config.xml b/default_config.xml
index 73a27e4..ae4f5e1 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -124,6 +124,33 @@ $URL$
       <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>