fence-agents: master - config: Fix fencing attribute requirements

Fabio M. Di Nitto fabbione at fedoraproject.org
Tue Apr 20 13:24:48 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=1215fd3ecec974c32df312dacb254ec29088825e
Commit:        1215fd3ecec974c32df312dacb254ec29088825e
Parent:        7ea053c04f6fe838069041df50c8a5118f082c39
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Thu Nov 19 12:39:44 2009 -0500
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Apr 20 14:40:46 2010 +0200

config: Fix fencing attribute requirements

There is no easy way to satisfy a "required" attribute
being present in more than one location.  Specifically, with
fencing devices, a required run-time parameter may appear
in one of three possible locations in cluster.conf.

Because this is difficult to detect, all fencing attributes
are now optional from the schema's perspective.

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 fence/agents/lib/fence2rng.xsl |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/fence/agents/lib/fence2rng.xsl b/fence/agents/lib/fence2rng.xsl
index e0c82bc..8d23ed9 100644
--- a/fence/agents/lib/fence2rng.xsl
+++ b/fence/agents/lib/fence2rng.xsl
@@ -11,12 +11,9 @@
         &lt;optional&gt;
           &lt;attribute name="option"/&gt; &lt;!-- deprecated; for compatibility.  use "action" --&gt;
         &lt;/optional&gt;<xsl:for-each select="parameters/parameter">
-	<xsl:choose><xsl:when test="@required = 1 or @primary = 1">
-        &lt;attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>" /&gt;</xsl:when><xsl:otherwise>
         &lt;optional&gt;
           &lt;attribute name="<xsl:value-of select="@name"/>" rha:description="<xsl:value-of select="normalize-space(shortdesc)"/>" /&gt;
-        &lt;/optional&gt;</xsl:otherwise>
-		</xsl:choose></xsl:for-each>
+        &lt;/optional&gt;</xsl:for-each>
       &lt;/group&gt;
 
 </xsl:template>


More information about the cluster-commits mailing list