X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=de707b792e705b815a6e335c8b4d16ee17715a59;hb=0a9902d2a55a0a9ac03601345c4284293669012b;hp=eeca137f01d5e501785eb76c975d3e5973f3816b;hpb=2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index eeca137f..de707b79 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -62,6 +62,13 @@ Thierry Parmentelat
             </description> 
         </variable>
 
+         <variable id="data_dir" type="string">
+            <name>Data Directory </name>
+            <value>/var/lib/sfa/</value>
+            <description>Directory where cached certficiates and other data is stored.
+            </description>
+        </variable>
+
       </variablelist>
     </category>
 
@@ -111,9 +118,10 @@ Thierry Parmentelat
       <variablelist>
 	<variable id="enabled" type="boolean">
 	  <name>Enable Slice Manager</name>
-	  <value>true</value>
+	  <value>false</value>
 	  <description>Allows this local SFA instance to run as a
-	  slice manager.</description>
+	  slice manager. Warning, this feature is not really supported
+	  any longer.</description>
 	</variable>
 
 	<variable id="host" type="hostname">
@@ -282,30 +290,11 @@ Thierry Parmentelat
       <description>The settings that tell this SFA instance how to interact with the FEDERICA testbed.</description>
 
       <variablelist>
-	<variable id="user" type="string">
-	  <name>FEDERICA login name for an admin user; SFA will carry on operations under this account.</name>
-	  <value>root</value>
-	  <description></description>
-	</variable>
-
-	<variable id="password" type="string">
-	  <name>Password</name>
-	  <value>rootpassword</value>
-	  <description>The PLC password for SFA_PLC_USER.</description>
-	</variable>
-
-	<variable id="hostname" type="string">
-	  <name>XMLRPC hostname</name>
-	  <value>federica.net</value>
-	  <description>Hostname for the federica xmlrpc interface.</description>
-	</variable>
-
-	<variable id="port" type="string">
-	  <name>XMLRPC port number</name>
-	  <value>10000</value>
-	  <description>Port number for the federica xmlrpc interface.</description>
+	<variable id="url" type="string">
+	  <name>XMLRPC URL</name>
+	  <value>https://root:password@federica.sfa.wrapper.com:8443/fedewrapper/xmlrpc/</value>
+	  <description>URL for the federica xmlrpc API; login and password need to be set like in http://login:password@hostname:port/the/path </description>
 	</variable>
-
       </variablelist>
     </category>
 
@@ -331,9 +320,44 @@ Thierry Parmentelat
           <value>8773</value>
           <description>The Nova/EC2 API port.</description>
         </variable>
+        <variable id="novarc" type="string">
+          <name>novarc</name>
+          <value>/root/novarc</value>
+          <description>Path to novarc client config file</description>
+        </variable>
       </variablelist>
     </category>
 
+    <!-- ======================================== -->
+    <category id="sfa_nitos">
+      <name></name>
+      <description>The settings that tell this SFA instance how to interact with the NITOS testbed.</description>
+
+      <variablelist>
+        <variable id="url" type="string">
+          <name>XMLRPC URL</name>
+          <value>http://195.251.17.239:8080/RPC2</value>
+          <description>URL for the NITOS Scheduler xmlrpc API</description>
+        </variable>
+      </variablelist>
+    </category>
+
+    <!-- ======================================== -->
+    <category id="sfa_dummy">
+      <name></name>
+      <description>The settings for using SFA with a demmy testbed.</description>
+
+      <variablelist>
+        <variable id="url" type="string">
+          <name>XMLRPC URL</name>
+          <value>http://127.0.0.1:8080</value>
+          <description>URL for the Dummy Testbed xmlrpc API</description>
+        </variable>
+      </variablelist>
+    </category>
+
+    <!-- ======================================== -->
+
   </variables>
 
   <comps>