X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=5ce430e4088c838d1d40f00db07592d8d3664f94;hb=9b30c6b0437afeb679cdf00bc8b7abae3e41dbd3;hp=9a0a887831d7882f4aaf8d4909f64761b186b048;hpb=c93d4d0631f5a295d209c6cb6f40ead6e2e97913;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index 9a0a8878..5ce430e4 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -39,10 +39,10 @@ Thierry Parmentelat
           <description>The path to the default credential schema</description>
         </variable>
 
-        <variable id="api_debug" type="boolean">
+        <variable id="api_loglevel" type="int">
           <name>Debug</name>
-          <value>false</value>
-          <description>Flag to turn debug on.</description>
+          <value>0</value>
+          <description>Logging level; 0=minimum, 1=info, 2=debug</description>
         </variable>
     
         <variable id="max_slice_renew" type="int">
@@ -128,6 +128,14 @@ Thierry Parmentelat
 	  <value>12347</value>
 	  <description>The port where the slice manager is to be found.</description>
 	</variable>
+
+	<variable id="caching" type="boolean">
+	  <name>Cache advertisement rspec</name>
+	  <value>false</value>
+	  <description>Enable caching of the global advertisement, as
+	  returned by ListResources without a slice argument. </description>
+	  </variable>
+
       </variablelist>
     </category>
 
@@ -145,12 +153,6 @@ Thierry Parmentelat
 	  aggregate manager.</description>
 	</variable>
 
-    <variable id="rspec_schema" type="string">
-      <name>RSpec Schema</name>
-      <value>/etc/sfa/pl.rng</value>
-      <description>The path to the default schema</description>
-    </variable>
-
 	<variable id="host" type="hostname">
 	  <name>Hostname</name>
 	  <value>localhost</value>
@@ -164,11 +166,12 @@ Thierry Parmentelat
 	  <description>The port where the aggregate is to be found.</description>
 	</variable>
 
-        <variable id="api_version" type="int">
-          <name>Aggregate Manager API Version</name>
-          <value>1</value>
-          <description>The Aggregate API version</description>
-        </variable>
+	<variable id="caching" type="boolean">
+	  <name>Cache advertisement rspec</name>
+	  <value>true</value>
+	  <description>Enable caching of the global advertisement, as
+	  returned by ListResources without a slice argument. </description>
+	  </variable>
 
       </variablelist>
 
@@ -274,6 +277,32 @@ Thierry Parmentelat
       </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>
+      </variablelist>
+    </category>
+
   </variables>
 
   <comps>