X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=d31e52585bbbc246b77ecb5112a2d73416ab4f7c;hb=2b8fb7af76b173ad4ad6583dbedbdf11a49f9549;hp=499bd6e721e2153619af2ff054b379a172528629;hpb=2d2a85edf02c635b592dfdb52c92dfa97b845f68;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index 499bd6e7..d31e5258 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -65,7 +65,7 @@ Thierry Parmentelat
          <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>Directory where cached certificates and other data is stored.
             </description>
         </variable>
 
@@ -109,44 +109,6 @@ Thierry Parmentelat
     </variablelist>
     </category>
 
-    <!-- ======================================== -->
-    <category id="sfa_sm">
-      <name>Slice Manager</name>
-      <description>The settings that affect the slice manager that will run
-      as part of this SFA instance.</description>
-
-      <variablelist>
-	<variable id="enabled" type="boolean">
-	  <name>Enable Slice Manager</name>
-	  <value>false</value>
-	  <description>Allows this local SFA instance to run as a
-	  slice manager. Warning, this feature is not really supported
-	  any longer.</description>
-	</variable>
-
-	<variable id="host" type="hostname">
-	  <name>Hostname</name>
-	  <value>localhost</value>
-	  <description>The hostname where the slice manager is expected to
-	  be found.</description>
-	</variable>
-
-	<variable id="port" type="int">
-	  <name>Port number</name>
-	  <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>
-
     <!-- ======================================== -->
     <category id="sfa_aggregate">
       <name>Aggregate</name>
@@ -258,64 +220,6 @@ Thierry Parmentelat
       </variablelist>
     </category>
 
-    <!-- ======================================== -->
-    <category id="sfa_federica">
-      <name></name>
-      <description>The settings that tell this SFA instance how to interact with the FEDERICA testbed.</description>
-
-      <variablelist>
-	<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>
-
-    <!-- ======================================== -->
-    <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>