Bug 698365

Created attachment 514702 [details]
Fix

(Oops, that's only one part)

(In reply to comment #6)
> Created attachment 514702 [details]
> Fix

ACK for the auto-generated bits. The .head will need manual love for the static agents (as comment #7 mention ;))

Yep, noticed that later.

Created attachment 514731 [details]
Fix, pass 2

Clarification:

* this feature must not introduce regressions in the schema; existing
configurations must still validate

* this feature must cause the ccs_update_schema program to generate
machine-readable hints which may be used by a UI or other program to associate
groups of parameters with fencing agents

* These hints must be stored in the cluster relaxng schema, or /usr/share/cluster/cluster.rng (which may be a symlink to another location)

(In reply to comment #10)
> Created attachment 514731 [details]
> Fix, pass 2

Patch looks good. ACK

Preliminary test results (development build):

[root@snap ~]# ccs_update_schema
[root@snap ~]# echo $?
0
[root@snap ~]# grep fence_wti /usr/share/cluster/cluster.rng
      <!-- fence_wti -->
      <group rha:name="fence_wti" rha:description="Fence agent for WTI">

http://git.fedorahosted.org/git?p=fence-agents.git;a=commit;h=7e570a1773f11afa9982ee1ed72c3482640dc52a

[root@snap ~]# rpm -q fence-agents
fence-agents-3.1.5-2.el6.x86_64
[root@snap ~]# ccs_update_schema ; echo $?
0
[root@snap ~]# ccs_config_validate ; echo $?
Configuration validates
0
[root@snap ~]# grep fence_wti /usr/share/cluster/cluster.rng 
      <!-- fence_wti -->
      <group rha:name="fence_wti" rha:description="Fence agent for WTI">
[root@snap ~]# grep fence_xvm /usr/share/cluster/cluster.rng

Oops - left it hanging:

[root@snap ~]# grep fence_xvm /usr/share/cluster/cluster.rng 
- fence_xvmd
<!-- fence_xvmd block -->
  <element name="fence_xvmd" rha:description="Fence_xvm daemon. The
      fence_xvmd fence device is an I/O fencing host that resides
      on dom0 and is used in conjunction with the fence_xvm fencing
<!-- end fence_xvmd block -->
      <!-- fence_xvm -->
      <group rha:name="fence_xvm" rha:description="Fence agent for virtual machines">
          <attribute name="key_file" rha:description="Shared key file (default=/etc/cluster/fence_xvm.key)" />
          <attribute name="use_uuid" rha:description="Treat [domain] as UUID instead of domain name. This is provided for compatibility with older fence_xvmd installations." />

Verified in version fence-agents-3.1.5-7.el6, kernel 2.6.32-191.el6


[root@z2 ~]# rpm -q fence-agents
fence-agents-3.1.5-7.el6.x86_64
[root@z2 ~]# ccs_update_schema 
[root@z2 ~]# echo $?
0
[root@z2 ~]# ccs_config_validate 
Configuration validates
[root@z2 ~]# echo $?
0
[root@z2 ~]# grep fence_wti /usr/share/cluster/cluster.rng
      <!-- fence_wti -->
      <group rha:name="fence_wti" rha:description="Fence agent for WTI">
[root@z2 ~]# grep fence_xvm /usr/share/cluster/cluster.rng
- fence_xvmd
<!-- fence_xvmd block -->
  <element name="fence_xvmd" rha:description="Fence_xvm daemon. The
      fence_xvmd fence device is an I/O fencing host that resides
      on dom0 and is used in conjunction with the fence_xvm fencing
<!-- end fence_xvmd block -->
      <!-- fence_xvm -->
      <group rha:name="fence_xvm" rha:description="Fence agent for virtual machines">
          <attribute name="key_file" rha:description="Shared key file (default=/etc/cluster/fence_xvm.key)" />
          <attribute name="use_uuid" rha:description="Treat [domain] as UUID instead of domain name. This is provided for compatibility with older fence_xvmd installations." />
[root@z2 ~]#

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

http://rhn.redhat.com/errata/RHBA-2011-1599.html