X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=config%2Fdefault_config.xml;h=6d807129684c79723e6c4077c7211a7aa424c293;hp=7eeb1c71e63aec02059697a14cf3d40f39a21ee0;hb=afe8da7a02c0650f0f6be8ab16b2494652d69d0d;hpb=25dc07a3f55ef5e21c659dcaad5ad7559e8a6896

diff --git a/config/default_config.xml b/config/default_config.xml
index 7eeb1c71..6d807129 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>
 
@@ -282,34 +289,43 @@ 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>
 
-
+    <!-- ======================================== -->
+    <category id="sfa_nova">
+      <name>SFA Flash Policy</name>
+      <description>The settings that affect how SFA connects to 
+                   the Nova/EC2 API</description>
+      <variablelist>
+        <variable id="user" type="string">
+          <name>Sfa nova user</name>
+          <value>novaadmin</value>
+          <description>Account/context to use when performing 
+                       administrative nova operations</description>
+        </variable>
+        <variable id="api_url" type="string">
+          <name>Nova API url</name>
+          <value>127.0.0.1</value>
+          <description>The Nova/EC2 API url </description>
+        </variable>
+        <variable id="api_port" type="int">
+          <name>Nova API Port</name>
+          <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>
 
   </variables>