Created attachment 574000 [details]
patch to resolve this issue for all Cisco UCS Systems on RHEL5+

Description of problem:
Latest package of system-config-cluster does not allow for the suborg directive with the fence_cisco_ucs agent.  Currently the latest version available on your site is: system-config-cluster-1.0.57-12.noarch.rpm

Version-Release number of selected component (if applicable):
<=1.0.57-12

How reproducible:
Every time :)

Steps to Reproduce:
Sample portion of cluster.conf
1.
<snip>
  <clusternodes>
    <clusternode name="node01.halc" nodeid="1" votes="1">
      <fence>
        <method name="1">
          <device name="ucs" port="RHEL_BLADE_1"/>
        </method>
      </fence>
    </clusternode>
    <clusternode name="node02.halc" nodeid="2" votes="1">
      <fence>
        <method name="1">
          <device name="ucs" port="RHEL_BLADE_2"/>
        </method>
      </fence>
    </clusternode>
  </clusternodes>
  <fencedevices>
    <fencedevice agent="fence_cisco_ucs" ssl="1" ipaddr="1.1.1.1" login="admin" name="ucs" passwd="mypass" suborg="org-RHEL_BLADE_1"/>
  </fencedevices>
</snip>

Actual results:
# xmllint --relaxng /usr/share/system-config-cluster/misc/cluster.ng /etc/cluster/cluster.conf | egrep error
Relax-NG validity error : Extra element fencedevices in interleave
/etc/cluster/cluster.conf:2: element cluster: Relax-NG validity error : Element cluster failed to validate content
/etc/cluster/cluster.conf fails to validate

This problem goes away if i remove the 'suborg' directive.

Expected results:
accept the argument in validation

Additional info:
This is a very minor issue, but we rely heavily on checking the cluster.conf after changes are made before accepting them.  Right now we can't do that.

Patch is attached.