CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-05-12 17:37:38
Modified files:
. : conga.spec.in.in
luci/cluster : resource-form-macros
luci/site/luci/Extensions: ResourceHandler.py
Log message:
Fix bz444938 (conga fails to create proper cluster.conf entries for
gfs2 filesystem type)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.86&r2=1.45.2.87
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.13&r2=1.21.2.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.5&r2=1.1.4.6
--- conga/conga.spec.in.in 2008/05/12 17:04:41 1.45.2.86
+++ conga/conga.spec.in.in 2008/05/12 17:37:38 1.45.2.87
@@ -292,6 +292,7 @@
### changelog ###
%changelog
* Mon Apr 27 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-9
+- Fix bz444938 (conga fails to create proper cluster.conf entries for gfs2
filesystem type)
- Fix bz444210 (Adding multiple fence devices at the same time causes
duplicate entries)
- Fix bz444381 (conga writes 'exportpath' instead of 'export' attribute for
netfs)
--- conga/luci/cluster/resource-form-macros 2008/04/28 03:58:42
1.21.2.13
+++ conga/luci/cluster/resource-form-macros 2008/05/12 17:37:38
1.21.2.14
@@ -631,6 +631,19 @@
</tr>
<tr class="systemsTable">
+ <td class="systemsTable">Filesystem type</td>
+ <td class="systemsTable"
+ tal:define="cur_fstype res/attrs/fstype |
string:gfs">
+
+ <input type="radio" name="fstype" value="gfs"
+ tal:attributes="checked
python:cur_fstype.lower() == 'gfs' and 'checked' or ''" />GFS
+ <br/>
+ <input type="radio" name="fstype" value="gfs2"
+ tal:attributes="checked
python:cur_fstype.lower() == 'gfs2' and 'checked' or ''" />GFS2
+ </td>
+ </tr>
+
+ <tr class="systemsTable">
<td class="systemsTable">Options</td>
<td class="systemsTable">
<input type="text" size="20" name="options"
--- conga/luci/site/luci/Extensions/ResourceHandler.py 2008/04/29 16:10:39
1.1.4.5
+++ conga/luci/site/luci/Extensions/ResourceHandler.py 2008/05/12 17:37:38
1.1.4.6
@@ -191,6 +191,19 @@
luci_log.debug_verbose('addGfs6: %s' % err)
try:
+ fstype = form['fstype'].lower().strip()
+ if not fstype:
+ raise KeyError, 'No filesystem type was given'
+ if fstype != 'gfs' and fstype != 'gfs2':
+ raise KeyError, 'An invalid file system type of "%s"
was given' % fstype
+ res.addAttribute('fstype', fstype)
+ except Exception, e:
+ err = str(e)
+ errors.append(err)
+ if LUCI_DEBUG_MODE is True:
+ luci_log.debug_verbose('addGfs7a: %s' % err)
+
+ try:
options = form['options'].strip()
if not options:
raise KeyError, 'no options'
