CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [email protected] 2010-08-05 19:06:35
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
Fix rhbz#533246: Conga does not write "auth" or "password" when
creating IPMI LAN fence device
Patches:
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.19&r2=1.4.2.20
--- conga/luci/site/luci/Extensions/FenceHandler.py 2010/08/05 17:33:05
1.4.2.19
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2010/08/05 19:06:35
1.4.2.20
@@ -894,15 +894,15 @@
errors.append(FD_PROVIDE_PASSWD)
try:
- auth_type = form['auth_type'].strip().lower()
+ auth_type = form['auth'].strip().lower()
if not auth_type or auth_type == 'none':
- fencedev.removeAttribute('auth_type')
+ fencedev.removeAttribute('auth')
elif auth_type == 'password' or auth_type == 'md5':
- fencedev.setAttribute('auth_type', auth_type)
+ fencedev.addAttribute('auth', auth_type)
else:
errors.append(FD_PROVIDE_IPMILAN_AUTH)
except KeyError, e:
- fencedev.removeAttribute('auth_type')
+ fencedev.removeAttribute('auth')
except Exception, e:
errors.append(FD_PROVIDE_IPMILAN_AUTH)
@@ -911,7 +911,7 @@
if not lanplus or lanplus == '0' or lanplus == 'false' or
lanplus == 'off':
fencedev.removeAttribute('lanplus')
else:
- fencedev.setAttribute('lanplus', '1')
+ fencedev.addAttribute('lanplus', '1')
except Exception, e:
fencedev.removeAttribute('lanplus')
