a little nicer wrt pep8

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index 33f8901..d31e525 100644 (file)
--- 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,20 +220,6 @@ Thierry Parmentelat
       </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>