From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 21 Sep 2007 03:24:13 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/form-mac ... Message-ID: <20070921032413.32080.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: RHEL4 Changes by: rmccabe at sourceware.org 2007-09-21 03:24:12 Modified files: . : conga.spec.in.in luci/cluster : form-macros luci/site/luci/Extensions: FenceHandler.py Log message: Fix bz286951 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.16&r2=1.67.2.17 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.176.2.21&r2=1.176.2.22 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.17.2.3&r2=1.17.2.4 --- conga/conga.spec.in.in 2007/08/29 01:02:00 1.67.2.16 +++ conga/conga.spec.in.in 2007/09/21 03:24:12 1.67.2.17 @@ -319,7 +319,7 @@ %changelog -* Tue Aug 28 2007 Ryan McCabe 0.11.0-1 +* Thu Sep 20 2007 Ryan McCabe 0.11.0-1 - Merge in fixes from the RHEL5 code base. - Fix bz238727 (Conga provides no way to remove a dead node from a cluster) - Fix bz241414 (Installation using Conga shows "error" in message during reboot cycle.) @@ -330,9 +330,10 @@ - Fix bz253906 (Quorum disk page: Error when trying to continue w/o a heuristic) - Fix bz253784 - Fix bz253901 (No node IDs generated on new RHEL4 / DLM cluster) +- Fix bz286951 (conga passes fence_scsi nodename, where as it accepts only node) - Related: bz241417 - Resolves: bz238727, bz241414, bz238656, bz245200, bz227723 -- Resolves: bz253905, bz253906, bz253784, bz253901 +- Resolves: bz253905, bz253906, bz253784, bz253901, bz286951 * Tue Apr 30 2007 Ryan McCabe 0.9.1-9 - Fix bz238656 (conga does not set the "nodename" attribute for manual fencing) --- conga/luci/cluster/form-macros 2007/08/24 21:55:42 1.176.2.21 +++ conga/luci/cluster/form-macros 2007/09/21 03:24:12 1.176.2.22 @@ -3017,8 +3017,8 @@ Node name - + --- conga/luci/site/luci/Extensions/FenceHandler.py 2007/08/09 21:28:52 1.17.2.3 +++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/09/21 03:24:12 1.17.2.4 @@ -124,7 +124,7 @@ 'fence_egenera': ['lpan', 'pserver'], 'fence_bullpap': ['domain'], 'fence_xvm': ['domain'], - 'fence_scsi': ['nodename'], + 'fence_scsi': ['node'], 'fence_ilo': [], 'fence_ipmilan': [], 'fence_drac': [], @@ -1118,10 +1118,10 @@ errors = list() try: - nodename = form['nodename'].strip() + nodename = form['node'].strip() if not nodename: raise Exception, 'blank' - fenceinst.addAttribute('nodename', nodename) + fenceinst.addAttribute('node', nodename) except Exception, e: errors.append(FI_PROVIDE_NODENAME)