git://git.onelab.eu / sfa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed list_categories
[sfa.git] / config / default_config.xml
diff --git a/config/default_config.xml b/config/default_config.xml
index 46e734e..6d80712 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -18,6 +18,15 @@ Thierry Parmentelat
       <description>Basic system variables.</description>
 
       <variablelist>
       <description>Basic system variables.</description>
 
       <variablelist>
+        <variable id="generic_flavour" type="string">
+          <name>Generic Flavour</name>
+          <value>pl</value>
+          <description>This string refers to a class located in sfa.generic that describes 
+          which specific implementation needs to be used for api, manager and driver objects.
+          PlanetLab users do not need to change this setting.
+          </description>
+        </variable>
+
         <variable id="interface_hrn" type="string">
           <name>Human readable name</name>
           <value>plc</value>
         <variable id="interface_hrn" type="string">
           <name>Human readable name</name>
           <value>plc</value>
@@ -30,14 +39,14 @@ Thierry Parmentelat
           <description>The path to the default credential schema</description>
         </variable>
 
           <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>
           <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>
     
-        <variable id="slice_max_renew" type="boolean">
-          <name>Slice Max Renew</name>
+        <variable id="max_slice_renew" type="int">
+          <name>Max Slice Renew</name>
           <value>60</value>
           <description>Maximum amout of days a user can extend/renew their slices to</description>
         </variable>
           <value>60</value>
           <description>Maximum amout of days a user can extend/renew their slices to</description>
         </variable>
@@ -49,9 +58,17 @@ Thierry Parmentelat
             it look like the user is the one performing the operation. Doing this requires a 
             valid key pair and credential for the user. This option defines the path where 
             key pairs and credentials are generated and stored.
             it look like the user is the one performing the operation. Doing this requires a 
             valid key pair and credential for the user. This option defines the path where 
             key pairs and credentials are generated and stored.
-            This functionality is used by the SFA web gui 
+            This functionality is used by the SFA web GUI. 
             </description> 
         </variable>
             </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>
 
       </variablelist>
     </category>
 
@@ -69,13 +86,6 @@ Thierry Parmentelat
          registry.</description>
        </variable>
 
          registry.</description>
        </variable>
 
-       <variable id="type" type="string">
-         <name>Registry type</name>
-         <value>pl</value>
-         <description>The type of backend server for this
-         registry. Some registries may not be myplc.</description>
-       </variable>
-
        <variable id="host" type="hostname">
          <name>Hostname</name>
          <value>localhost</value>
        <variable id="host" type="hostname">
          <name>Hostname</name>
          <value>localhost</value>
@@ -100,141 +110,127 @@ Thierry Parmentelat
     </category>
 
     <!-- ======================================== -->
     </category>
 
     <!-- ======================================== -->
-    <category id="sfa_aggregate">
-      <name>Aggregate</name>
-      <description>The settings that affect the aggregate manager that will run
+    <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">
       as part of this SFA instance.</description>
 
       <variablelist>
        <variable id="enabled" type="boolean">
-         <name>Enable Aggregate</name>
+         <name>Enable Slice Manager</name>
          <value>true</value>
          <value>true</value>
-         <description>Allows this local SFA instance to run as an
-         aggregate manager.</description>
+         <description>Allows this local SFA instance to run as a
+         slice manager.</description>
        </variable>
 
        </variable>
 
-       <variable id="type" type="string">
-         <name>Aggregate type</name>
-         <value>pl</value>
-         <description>The type of backend server for this
-         aggregate. Some aggregates may not be myplc.</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>
        <variable id="host" type="hostname">
          <name>Hostname</name>
          <value>localhost</value>
-         <description>The hostname where the aggregate is expected to
+         <description>The hostname where the slice manager is expected to
          be found.</description>
        </variable>
 
        <variable id="port" type="int">
          <name>Port number</name>
          be found.</description>
        </variable>
 
        <variable id="port" type="int">
          <name>Port number</name>
-         <value>12346</value>
-         <description>The port where the aggregate is to be found.</description>
+         <value>12347</value>
+         <description>The port where the slice manager is to be found.</description>
        </variable>
        </variable>
-      </variablelist>
 
 
+       <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>
 
     <!-- ======================================== -->
-    <category id="sfa_sm">
-      <name>Slice Manager</name>
-      <description>The settings that affect the slice manager that will run
+    <category id="sfa_aggregate">
+      <name>Aggregate</name>
+      <description>The settings that affect the aggregate manager that will run
       as part of this SFA instance.</description>
 
       <variablelist>
        <variable id="enabled" type="boolean">
       as part of this SFA instance.</description>
 
       <variablelist>
        <variable id="enabled" type="boolean">
-         <name>Enable Slice Manager</name>
+         <name>Enable Aggregate</name>
          <value>true</value>
          <value>true</value>
-         <description>Allows this local SFA instance to run as a
-         slice manager.</description>
-       </variable>
-
-       <variable id="type" type="string">
-         <name>Slice Manager type</name>
-         <value>pl</value>
-         <description>The type of backend server for this
-         slice manager. Not all slice managers are myplc.</description>
+         <description>Allows this local SFA instance to run as an
+         aggregate manager.</description>
        </variable>
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
          <value>localhost</value>
        </variable>
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
          <value>localhost</value>
-         <description>The hostname where the slice manager is expected to
+         <description>The hostname where the aggregate is expected to
          be found.</description>
        </variable>
 
        <variable id="port" type="int">
          <name>Port number</name>
          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>
+         <value>12346</value>
+         <description>The port where the aggregate is to be found.</description>
        </variable>
        </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>
       </variablelist>
+
     </category>
 
     <!-- ======================================== -->
     </category>
 
     <!-- ======================================== -->
-    <category id="sfa_plc">
+    <category id="sfa_db">
       <name></name>
       <name></name>
-      <description>The settings that tell this SFA instance how to interact with the underlying PLC. Refer to plc-config-tty on this installation for more information.</description>
+      <description>The settings that tell this SFA instance where to find its database. You can essentially leave this as-is unless you plan on hosting your data on some other box.</description>
 
       <variablelist>
 
       <variablelist>
-       <variable id="user" type="string">
-         <name>PLC login name for an admin user; SFA will carry on operations under this account.</name>
-         <value>root@localhost.localdomain</value>
-         <description></description>
-       </variable>
-
-       <variable id="password" type="string">
-         <name>Password</name>
-         <value>root</value>
-         <description>The PLC password for SFA_PLC_USER.</description>
-       </variable>
-
-       <variable id="url" type="string">
-         <name>URL</name>
-         <value>https://localhost:443/PLCAPI/</value>
-         <description>Full URL of PLC interface.</description>
-       </variable>
-
-       <variable id="db_name" type="string">
-         <name>Database name</name>
-         <value>planetlab5</value>
-         <description>Planetlab database name.</description>
+       <variable id="enabled" type="boolean">
+         <name>Enabled</name>
+         <value>true</value>
+         <description>Enable the database server on this machine.</description>
        </variable>
 
        </variable>
 
-       <variable id="db_host" type="hostname">
-         <name>Datbase host</name>
+       <variable id="host" type="hostname">
+         <name>Database host</name>
          <value>localhost</value>
          <value>localhost</value>
-         <description>The host where the PLC database can be reached.</description>
+         <description>The host where the SFA database can be reached.</description>
        </variable>
 
        </variable>
 
-       <variable id="db_port" type="int">
+       <variable id="port" type="int">
          <name>Database port</name>
          <value>5432</value>
          <name>Database port</name>
          <value>5432</value>
-         <description>The port where the PLC database can be reached.</description>
+         <description>The port where the SFA database can be reached.</description>
        </variable>
 
        </variable>
 
-       <variable id="db_user" type="string">
+       <variable id="user" type="string">
          <name>Database user</name>
          <name>Database user</name>
-         <value>pgsqluser</value>
-         <description></description>
+         <value>sfadbuser</value>
+         <description>When SFA gets co-hosted with a myplc, this should match the PLC config.</description>
        </variable>
 
        </variable>
 
-       <variable id="db_password" type="string">
+       <variable id="password" type="string">
          <name>Database password</name>
          <value></value>
          <name>Database password</name>
          <value></value>
-         <description>The password for PLC_DB_USER.</description>
+         <description>When SFA gets co-hosted with a myplc, this should match the PLC config.</description>
+       </variable>
+
+       <variable id="name" type="string">
+         <name>Database name</name>
+         <value>sfa</value>
+         <description>SFA database name.</description>
        </variable>
 
        </variable>
 
+
       </variablelist>
     </category>
 
       </variablelist>
     </category>
 
+    <!-- ======================================== -->
     <category id="sfa_flashpolicy">
       <name>SFA Flash Policy</name>
       <description>The settings that affect the flash policy server that will run
     <category id="sfa_flashpolicy">
       <name>SFA Flash Policy</name>
       <description>The settings that affect the flash policy server that will run
@@ -260,6 +256,77 @@ Thierry Parmentelat
       </variablelist>
     </category>
 
       </variablelist>
     </category>
 
+    <!-- ======================================== -->
+    <category id="sfa_plc">
+      <name></name>
+      <description>The settings that tell this SFA instance how to interact with the underlying PLC. Refer to plc-config-tty on this installation for more information.</description>
+
+      <variablelist>
+       <variable id="user" type="string">
+         <name>PLC login name for an admin user; SFA will carry on operations under this account.</name>
+         <value>root@localhost.localdomain</value>
+         <description></description>
+       </variable>
+
+       <variable id="password" type="string">
+         <name>Password</name>
+         <value>root</value>
+         <description>The PLC password for SFA_PLC_USER.</description>
+       </variable>
+
+       <variable id="url" type="string">
+         <name>URL</name>
+         <value>https://localhost:443/PLCAPI/</value>
+         <description>Full URL of PLC interface.</description>
+       </variable>
+
+      </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>
+
   </variables>
 
   <comps>
   </variables>
 
   <comps>
sfa