* support mutlitple mds with one uuid (539)

lmc --add mds --mds mds1 --node hostA ...
lmc --add mds --mds mds1 --node hostB ...

Creates two different mdsdev in the config, and one mds. The lovconfig
reference is now attached to the mds service instead of the node, so both
mdsdevs can configure the LOVs.

Needless to say, the xml format has changed yet again, so
regenerate those configs.

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index d7a678e..73f7c95 100644 (file)
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -30,7 +30,7 @@
                 hi CDATA #IMPLIED >
 
 <!ELEMENT profile (ldlm_ref | network_ref | obd_ref | ost_ref |
-                   echoclient_ref | mds_ref | lov_ref |
+                   echoclient_ref | mdsdev_ref | lov_ref |
                    lovconfig_ref| mountpoint_ref)*>
 <!ATTLIST profile %object.attr;>
 
@@ -43,17 +43,20 @@
 <!ELEMENT ldlm EMPTY>
 <!ATTLIST ldlm %object.attr;>
 
-<!ELEMENT obd (fstype | devpath | devsize | autoformat | activetarget)*>
+<!ELEMENT obd (fstype | devpath | devsize | autoformat | active_ref)*>
 <!ATTLIST obd %object.attr; 
               obdtype (obdfilter | obdecho) 'obdfilter'>
 
 <!ELEMENT ost (network_ref | obd_ref | failover_ref)*>
 <!ATTLIST ost %object.attr;>
 
-<!ELEMENT mds (network_ref | fstype | devpath | devsize | autoformat | 
-               server_ref | failover_ref | node_ref )*>
+<!ELEMENT mds (active_ref)*>
 <!ATTLIST mds %object.attr;>
 
+<!ELEMENT mdsdev (fstype | devpath | devsize | autoformat | 
+                  mds_ref | network_ref )*>
+<!ATTLIST mdsdev %object.attr;>
+
 <!ELEMENT lov (mds_ref |(obd_ref)+)*>
 <!ATTLIST lov %object.attr;
                stripesize    CDATA #REQUIRED
@@ -88,6 +91,8 @@
 <!ATTLIST obd_ref         %objref.attr;>
 <!ELEMENT mds_ref         %objref.content;>
 <!ATTLIST mds_ref         %objref.attr;>
+<!ELEMENT mdsdev_ref      %objref.content;>
+<!ATTLIST mdsdev_ref      %objref.attr;>
 <!ELEMENT ost_ref         %objref.content;>
 <!ATTLIST ost_ref         %objref.attr;>
 <!ELEMENT lov_ref         %objref.content;>

diff --git a/lustre/conf/lustre2ldif.xsl b/lustre/conf/lustre2ldif.xsl
index faebeea..f5d8098 100644 (file)
--- a/lustre/conf/lustre2ldif.xsl
+++ b/lustre/conf/lustre2ldif.xsl
@@ -54,6 +54,15 @@ port: <value-of select="port"/>
 dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
 objectClass: MDS
 lustreName: <value-of select="@name"/>
+uuid: <value-of select="@uuid"/><apply-templates/>
+<text>
+</text>
+</template>
+
+<template match="mdsdev">
+dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
+objectClass: MDSDEV
+lustreName: <value-of select="@name"/>
 uuid: <value-of select="@uuid"/>
 <if test="fstype">
 fstype: <value-of select="fstype"/>
@@ -68,7 +77,7 @@ devpath: <value-of select="devpath"/>
 devsize: <value-of select="devsize"/>
 </if>
 networkRef: <value-of select="network_ref/@uuidref"/>
-nodeRef: <value-of select="node_ref/@uuidref"/>
+mdsRef: <value-of select="mds_ref/@uuidref"/>
 <text>
 </text>
 </template>
@@ -86,7 +95,6 @@ stripecount: <value-of select="@stripecount"/><apply-templates/>
 </text>
 </template>
 
-
 <template match="lovconfig">
 dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
 objectClass: LOVCONFIG
@@ -101,7 +109,7 @@ dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
 objectClass: OBD
 lustreName: <value-of select="@name"/>
 uuid: <value-of select="@uuid"/>
-activetarget: <value-of select="activetarget"/>
+activeRef: <value-of select="active_ref/@uuidref"/>
 obdtype: <value-of select="@obdtype"/>
 <if test="fstype">
 fstype: <value-of select="fstype"/>
@@ -168,7 +176,6 @@ obdRef: <value-of select="@uuidref"/>
 ostRef: <value-of select="@uuidref"/>
 </template>
 
-
 <template match="network_ref">
 networkRef: <value-of select="@uuidref"/>
 </template>
@@ -197,6 +204,9 @@ lovconfigRef: <value-of select="@uuidref"/>
 path: <value-of select="."/>
 </template>
 
+<template match="active_ref">
+activeRef: <value-of select="@uuidref"/>
+</template>
 </stylesheet>