X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=68c47a54219f3a363858d00be8c28d39056e0c94;hb=126d9e887b298b07f4446196507bedb8d8c4da5d;hp=a417fe4bbb9fc17fb990f2e9f495019604293c90;hpb=656bb03ce9fa921fd9eb6fb60f247a4ada47e524;p=myplc.git
diff --git a/default_config.xml b/default_config.xml
index a417fe4..68c47a5 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -39,7 +39,7 @@ Copyright (C) 2006 The Trustees of Princeton University
Root in Hierarchical Naming Space
planetlab.test
- The root of this peer in the hierarchical federation naming space.
+ 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
@@ -123,6 +123,20 @@ Copyright (C) 2006 The Trustees of Princeton University
Defaults for nodes and slices contents.
+
+ f8,f12,f14,centos5,centos6:vs; default:lxc
+ 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.
+
+
arch for nodes
@ARCH@
@@ -659,25 +673,6 @@ Copyright (C) 2006 The Trustees of Princeton University
The fully qualified hostname of the XMPP server.
-
- XMPP username
-
- XMPP username (which has admin rights).
-
-
-
- XMPP password
-
- The password of the XMPP user.
-
-
-
-
- OMF Slicemgr URL
- http://localhost.localdomain:5053
- .
-
-
@@ -864,8 +859,8 @@ Copyright (C) 2006 The Trustees of Princeton University
vsys tags set by default
-
- 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.
+
+ 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