From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 16 Apr 2008 20:46:43 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/fence-ma ... Message-ID: <20080416204643.21617.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Branch: RHEL5 Changes by: rmccabe at sourceware.org 2008-04-16 20:46:41 Modified files: . : conga.spec.in.in luci/cluster : fence-macros validate_fence.js luci/site/luci/Extensions: FenceHandler.py luci/site/luci/var: Data.fs Log message: Use the 'ipaddr' attribute, not 'hostname' for RSA and RSB fencing. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.78&r2=1.45.2.79 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.3&r2=1.2.2.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fence.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.7&r2=1.1.2.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.11&r2=1.4.2.12 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.31&r2=1.15.2.32 --- conga/conga.spec.in.in 2008/04/14 15:58:35 1.45.2.78 +++ conga/conga.spec.in.in 2008/04/16 20:46:08 1.45.2.79 @@ -294,6 +294,7 @@ * Thu Apr 10 2008 Ryan McCabe 0.12.0-8 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used) - Fix bz441573 ("nodename" field for fence_scsi disabled when adding a new fence device/instance) +- Use the 'ipaddr' attribute, not 'hostname' for RSA and RSB fencing. * Wed Feb 27 2008 Ryan McCabe 0.12.0-6 - Fix bz434586 (Resource tree does not display multiple children of a parent correctly) --- conga/luci/cluster/fence-macros 2008/04/11 22:43:30 1.2.2.3 +++ conga/luci/cluster/fence-macros 2008/04/16 20:46:09 1.2.2.4 @@ -188,6 +188,10 @@ + + + + @@ -329,6 +333,7 @@ + @@ -701,8 +706,8 @@ Hostname - + @@ -742,6 +747,66 @@ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Fence TypeFujitsu Siemens RemoteView Service Board (RSB)
Name + +
Hostname + +
Login + +
Password + +
+ Password Script (optional) + + +
+ + + + + + + +
+
+
@@ -1376,6 +1441,7 @@ + --- conga/luci/cluster/validate_fence.js 2008/01/23 04:44:30 1.1.2.7 +++ conga/luci/cluster/validate_fence.js 2008/04/16 20:46:09 1.1.2.8 @@ -34,7 +34,8 @@ fence_validator['manual'] = []; fence_validator['mcdata'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ]; fence_validator['rps10'] = [ 'device', 'port']; -fence_validator['rsa'] = [ 'hostname', 'login', 'passwd', 'passwd_script' ]; +fence_validator['rsa'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ]; +fence_validator['rsb'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ]; fence_validator['sanbox2'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ]; fence_validator['scsi'] = []; fence_validator['unknown'] = []; --- conga/luci/site/luci/Extensions/FenceHandler.py 2008/01/23 04:44:32 1.4.2.11 +++ conga/luci/site/luci/Extensions/FenceHandler.py 2008/04/16 20:46:09 1.4.2.12 @@ -543,10 +543,10 @@ errors = list() try: - hostname = form['hostname'].strip() + hostname = form['ipaddr'].strip() if not hostname: raise Exception, 'blank' - fencedev.addAttribute('hostname', hostname) + fencedev.addAttribute('ipaddr', hostname) except Exception, e: errors.append(FD_PROVIDE_HOSTNAME) @@ -822,6 +822,7 @@ 'fence_ipmilan': val_ipmilan_fd, 'fence_drac': val_drac_fd, 'fence_rsa': val_rsa_fd, + 'fence_rsb': val_rsa_fd, # same params as rsa 'fence_rps10': val_rps10_fd, 'fence_manual': val_noop_fd } @@ -1082,6 +1083,7 @@ 'fence_ipmilan': val_noop_fi, 'fence_drac': val_noop_fi, 'fence_rsa': val_noop_fi, + 'fence_rsb': val_noop_fi, 'fence_rps10': val_noop_fi } Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2008/03/24 23:18:23 1.15.2.31 and /cvs/cluster/conga/luci/site/luci/var/Data.fs 2008/04/16 20:46:09 1.15.2.32 differ rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed