CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [email protected] 2011-03-25 21:14:36
Modified files:
luci/cluster : fence-macros
luci/site/luci/Extensions: FenceHandler.py
Log message:
Fix bz690936 - RFE: fence_cisco_ucs needs to support sub-organizations
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.19&r2=1.2.2.20
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.24&r2=1.4.2.25
--- conga/luci/cluster/fence-macros 2011/02/25 15:54:33 1.2.2.19
+++ conga/luci/cluster/fence-macros 2011/03/25 21:14:35 1.2.2.20
@@ -2005,6 +2005,13 @@
</td>
</tr>
<tr>
+ <td>Sub-organization</td>
+ <td>
+ <input name="suborg" type="text"
+ tal:attributes="value
cur_fencedev/suborg | nothing" />
+ </td>
+ </tr>
+ <tr>
<td>Power wait (seconds)</td>
<td>
<input type="text" name="power_wait"
--- conga/luci/site/luci/Extensions/FenceHandler.py 2011/02/25 15:54:33
1.4.2.24
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2011/03/25 21:14:36
1.4.2.25
@@ -833,6 +833,14 @@
else:
fencedev.removeAttribute('ssl')
+ try:
+ suborg = form['suborg'].strip()
+ if not suborg:
+ raise Exception, 'blank'
+ fencedev.addAttribute('suborg', suborg)
+ except Exception, e:
+ fencedev.removeAttribute('suborg')
+
has_passwd = False
try:
pwd = form['passwd'].strip()
