X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconf%2Flustre.dtd;h=0e8ad339004d067ba08fdf2d01f3c177fdde6633;hb=a26f9bdc16c59c923b60f27cf482e2952ef67cca;hp=8d575a615ae795844b00fcc46893a1e328074e89;hpb=040033cef24c5aca2967daf2da7a862abcd074cf;p=fs%2Flustre-release.git

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 8d575a61..0e8ad33 100644
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -12,8 +12,10 @@
 <!-- main elements -->
 <!ELEMENT lustre (node | profile | mountpoint | ldlm | ptlrpc |echoclient |
                   mds | mdsdev| ost | osd | lov | lovconfig)*>
+<!ATTLIST lustre version CDATA #REQUIRED>
 
-<!ELEMENT node (network | routetbl | profile_ref)*>
+<!ELEMENT node (network | routetbl | profile_ref | timeout | 
+                lustreUpcall | portalsUpcall | ptldebug | subsystem)*>
 <!ATTLIST node %object.attr;
                router CDATA #IMPLIED>
                
@@ -31,10 +33,11 @@
 
 <!ELEMENT profile (ldlm_ref | ptlrpc_ref | network_ref | routetbl_ref |
                    osd_ref | mdsdev_ref | lovconfig_ref|
-                   echoclient_ref | mountpoint_ref)*>
+                   echoclient_ref | mountpoint_ref | mgmt_ref)*>
 <!ATTLIST profile %object.attr;>
 
-<!ELEMENT mountpoint (path | fileset | mds_ref | obd_ref)*>
+<!ELEMENT mountpoint path #REQUIRED
+                     filesystem_ref #REQUIRED >
 <!ATTLIST mountpoint %object.attr;>
 
 <!ELEMENT echoclient (obd_ref)>
@@ -43,22 +46,32 @@
 <!ELEMENT ldlm EMPTY>
 <!ATTLIST ldlm %object.attr;>
 
+<!ELEMENT mgmt (active_ref)*>
+<!ATTLIST mgmt %object.attr;>
+
 <!ELEMENT ptlrpc EMPTY>
 <!ATTLIST ptlrpc %object.attr;>
 
 <!ELEMENT osd (fstype | devpath | devsize | autoformat | 
-               target_ref | node_ref)*>
+               target_ref | node_ref | journalsize | mkfsoptions)*>
 <!ATTLIST osd %object.attr; 
               osdtype (obdfilter | obdecho) 'obdfilter'>
 
-<!ELEMENT ost (active_ref)*>
-<!ATTLIST ost %object.attr;>
+<!ELEMENT ost (active_ref | group)*>
+<!ATTLIST ost %object.attr;
+              failover ( 1 | 0 ) #IMPLIED>
+
+<!ELEMENT filesystem mds_ref #REQUIRED
+                     obd_ref #REQUIRED
+                     (mgmt_ref)* >
+<!ATTLIST filesystem %object.attr;>
 
-<!ELEMENT mds (active_ref | lovconfig_ref)*>
-<!ATTLIST mds %object.attr;>
+<!ELEMENT mds (active_ref | lovconfig_ref | group)*>
+<!ATTLIST mds %object.attr;
+              failover ( 1 | 0 ) #IMPLIED>
 
 <!ELEMENT mdsdev (fstype | devpath | devsize | autoformat | 
-                  target_ref | node_ref )*>
+                  target_ref | node_ref | journalsize | mkfsoptions)*>
 <!ATTLIST mdsdev %object.attr;>
 
 <!ELEMENT lov (mds_ref |(obd_ref)+)*>
@@ -72,11 +85,17 @@
 <!ATTLIST lovconfig %object.attr;>
 
 <!-- basic elements -->
+<!ELEMENT recoveryUpcall %object.content;>
+<!ELEMENT timeout       %object.content;>
+<!ELEMENT ptldebug      %object.content;>
+<!ELEMENT subsystem     %object.content;>
+<!ELEMENT journalsize   %object.content;>
+<!ELEMENT mkfsoptions   %object.content;>
 <!ELEMENT fstype        %object.content;>
 <!ELEMENT nid           %object.content;>
 <!ELEMENT port          %object.content;>
-<!ELEMENT sendmem      %object.content;>
-<!ELEMENT recvmem      %object.content;>
+<!ELEMENT sendmem       %object.content;>
+<!ELEMENT recvmem       %object.content;>
 <!ELEMENT autoformat    %object.content;>
 <!ELEMENT activetarget  %object.content;>
 <!ELEMENT devpath       %object.content;>
@@ -103,16 +122,20 @@
 <!ATTLIST obd_ref         %objref.attr;>
 <!ELEMENT ost_ref         %objref.content;>
 <!ATTLIST ost_ref         %objref.attr;>
-<!ELEMENT active_ref         %objref.content;>
-<!ATTLIST active_ref         %objref.attr;>
-<!ELEMENT target_ref         %objref.content;>
-<!ATTLIST target_ref         %objref.attr;>
+<!ELEMENT active_ref      %objref.content;>
+<!ATTLIST active_ref      %objref.attr;>
+<!ELEMENT target_ref      %objref.content;>
+<!ATTLIST target_ref      %objref.attr;>
 <!ELEMENT lov_ref         %objref.content;>
 <!ATTLIST lov_ref         %objref.attr;>
 <!ELEMENT lovconfig_ref   %objref.content;>
 <!ATTLIST lovconfig_ref   %objref.attr;>
+<!ELEMENT mgmt_ref        %objref.content;>
+<!ATTLIST mgmt_ref        %objref.attr;>
 <!ELEMENT mountpoint_ref  %objref.content;>
 <!ATTLIST mountpoint_ref  %objref.attr;>
+<!ELEMENT filesystem_ref  %objref.content;>
+<!ATTLIST filesystem_ref  %objref.attr;>
 <!ELEMENT echoclient_ref  %objref.content;>
 <!ATTLIST echoclient_ref  %objref.attr;>
 <!ELEMENT failover_ref    %objref.content;>