X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=68c47a54219f3a363858d00be8c28d39056e0c94;hb=d8e1032be6c99ebeed2a6084fe8b63fc4f67ee63;hp=05007950fe3ae125fd581f3e68d136c46cba28a4;hpb=02d3482536dbd282f3eb7acc6920c8f320c63859;p=myplc.git
diff --git a/default_config.xml b/default_config.xml
index 0500795..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
- .
-
-
@@ -860,11 +855,12 @@ Copyright (C) 2006 The Trustees of Princeton University
vsys
- Default vsys tags
+ Default values for the vsys tag
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-default-tags.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