CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [email protected] 2011-03-25 20:01:44
Modified files:
luci/cluster : resource-form-macros
luci/site/luci/Extensions: ResourceHandler.py
Log message:
Fix bz679866 - Add the ability to configure the "self_fence" attribute
for the LVM resource
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.19&r2=1.21.2.20
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.11&r2=1.1.4.12
--- conga/luci/cluster/resource-form-macros 2011/02/25 15:54:33
1.21.2.19
+++ conga/luci/cluster/resource-form-macros 2011/03/25 20:01:43
1.21.2.20
@@ -1298,6 +1298,15 @@
value res/attrs/lv_name |
nothing" />
</td>
</tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Fence the node if it is unable
to clean up LVM tags</td>
+ <td class="systemsTable">
+ <input type="checkbox" name="self_fence"
+ tal:attributes="
+ disabled python: editDisabled;
+ checked res/attrs/self_fence |
nothing" />
+ </td>
+ </tr>
</table>
<div metal:use-macro="here/resource-form-macros/macros/res_form_footer"
/>
--- conga/luci/site/luci/Extensions/ResourceHandler.py 2011/02/25 15:54:33
1.1.4.11
+++ conga/luci/site/luci/Extensions/ResourceHandler.py 2011/03/25 20:01:43
1.1.4.12
@@ -692,6 +692,10 @@
if LUCI_DEBUG_MODE is True:
luci_log.debug_verbose('addLVM6: no vg_name or lv_name
for "%s"' % rname)
+ if form.has_key('self_fence'):
+ res.addAttribute('self_fence', '1')
+ else:
+ res.removeAttribute('self_fence')
return errors
def addSAPDatabase(res, rname, form, model):
