Branch: b1_4

Add support for mountfsoptions and clientoptions to LDAP.
b=5873
r=fergal (original patch)

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 0e8ad33..ff37771 100644 (file)
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -37,6 +37,7 @@
 <!ATTLIST profile %object.attr;>
 
 <!ELEMENT mountpoint path #REQUIRED
+                     clientoptions #REQUIRED >
                      filesystem_ref #REQUIRED >
 <!ATTLIST mountpoint %object.attr;>
 
@@ -53,7 +54,7 @@
 <!ATTLIST ptlrpc %object.attr;>
 
 <!ELEMENT osd (fstype | devpath | devsize | autoformat | 
-               target_ref | node_ref | journalsize | mkfsoptions)*>
+               target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST osd %object.attr; 
               osdtype (obdfilter | obdecho) 'obdfilter'>
 
@@ -71,7 +72,7 @@
               failover ( 1 | 0 ) #IMPLIED>
 
 <!ELEMENT mdsdev (fstype | devpath | devsize | autoformat | 
-                  target_ref | node_ref | journalsize | mkfsoptions)*>
+                  target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST mdsdev %object.attr;>
 
 <!ELEMENT lov (mds_ref |(obd_ref)+)*>
@@ -91,6 +92,8 @@
 <!ELEMENT subsystem     %object.content;>
 <!ELEMENT journalsize   %object.content;>
 <!ELEMENT mkfsoptions   %object.content;>
+<!ELEMENT mountfsoptions %object.content;>
+<!ELEMENT clientoptions %object.content;>
 <!ELEMENT fstype        %object.content;>
 <!ELEMENT nid           %object.content;>
 <!ELEMENT port          %object.content;>

diff --git a/lustre/conf/lustre2ldif.xsl b/lustre/conf/lustre2ldif.xsl
index 8c3c24a..58b0649 100644 (file)
--- a/lustre/conf/lustre2ldif.xsl
+++ b/lustre/conf/lustre2ldif.xsl
@@ -125,6 +125,9 @@ journalsize: <value-of select="journalsize"/>
 <if test="mkfsoptions">
 mkfsoptions: <value-of select="mkfsoptions"/>
 </if>
+<if test="mountfsoptions">
+mountfsoptions: <value-of select="mountfsoptions"/>
+</if>
 nodeRef: <value-of select="node_ref/@uuidref"/>
 targetRef: <value-of select="target_ref/@uuidref"/>
 <text>
@@ -179,6 +182,9 @@ journalsize: <value-of select="journalsize"/>
 <if test="mkfsoptions">
 mkfsoptions: <value-of select="mkfsoptions"/>
 </if>
+<if test="mountfsoptions">
+mountfsoptions: <value-of select="mountfsoptions"/>
+</if>
 <text>
 </text>
 </template>
@@ -213,6 +219,9 @@ dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
 objectClass: MOUNTPOINT
 lustreName: <value-of select="@name"/>
 uuid: <value-of select="@uuid"/><apply-templates/>
+<if test="clientoptions">
+clientoptions: <value-of select="clientoptions"/>
+</if>
 <text>
 </text>
 </template>