* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2006-10-16 19:58 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2006-10-16 19:58 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-10-16 19:58:38
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
fix typo
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- conga/luci/site/luci/Extensions/FenceHandler.py 2006/10/06 21:08:54 1.3
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2006/10/16 19:58:38 1.4
@@ -248,7 +248,7 @@
pass
def pop_vixel(self, attrs):
- self.vixel_port_text(attrs["port"])
+ self.vixel_port.set_text(attrs["port"])
def pop_mcdata(self, attrs):
self.mcdata_port.set_text(attrs["port"])
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2006-11-09 16:45 jparsons
0 siblings, 0 replies; 11+ messages in thread
From: jparsons @ 2006-11-09 16:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: jparsons at sourceware.org 2006-11-09 16:45:02
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
fence xen and fence csci
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.4&r2=1.5
--- conga/luci/site/luci/Extensions/FenceHandler.py 2006/10/16 19:58:38 1.4
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2006/11/09 16:45:02 1.5
@@ -68,6 +68,8 @@
"fence_egenera":True,
"fence_bullpap":True,
"fence_drac":False,
+ "fence_xvm":True,
+ "fence_scsi":True,
"fence_ipmilan":False,
"fence_manual":False }
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2006-12-21 3:41 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2006-12-21 3:41 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-12-21 03:41:43
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
fix a typo
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- conga/luci/site/luci/Extensions/FenceHandler.py 2006/12/20 22:06:49 1.10
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2006/12/21 03:41:43 1.11
@@ -3,12 +3,12 @@
import MessageLibrary
import ModelBuilder
#from FenceDevice import FenceDevice
-from conga_constants import *
+from conga_constants import FD_VAL_SUCCESS, FD_VAL_FAIL
INSTALLDIR="/usr/share/system-config-cluster"
FD_NEW_SUCCESS = "New %s successfully added to cluster"
-FD_NEW_SUCCESS = "Fence device %s successfully updated"
+FD_UPDATE_SUCCESS = "Fence device %s successfully updated"
FD_NEW_FAIL = "No agent type %s in shared device list"
FD_PROVIDE_NAME = "A unique name must be provided for each Fence Device"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-01-19 20:57 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-01-19 20:57 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-19 20:57:38
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
return the new fence name when a fence device is added or edited, as it may have been changed to comply with the naming requirements imposed by the relax-ng schema
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/01/19 19:41:26 1.13
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/01/19 20:57:38 1.14
@@ -209,7 +209,7 @@
fencedevptr = model.getFenceDevicePtr()
fencedevptr.addChild(fencedev)
model.setModified(True)
- return (FD_VAL_SUCCESS, FD_NEW_SUCCESS % FENCE_OPTS[fencedev.getAttribute('agent')])
+ return (FD_VAL_SUCCESS, fencedev.getAttribute('name'))
except Exception, e:
ret = FD_PROVIDE_AGENT
@@ -239,7 +239,7 @@
ret = validate_fencedevice(form, model, fencedev, fence_edit=True)
if ret is None:
model.setModified(True)
- return (FD_VAL_SUCCESS, FD_UPDATE_SUCCESS % FENCE_OPTS[fencedev.getAttribute('name')])
+ return (FD_VAL_SUCCESS, fencedev.getAttribute('name'))
except Exception, e:
ret = FD_PROVIDE_NAME
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-07-24 15:00 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-07-24 15:00 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-07-24 15:00:30
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
Fix 249097
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.6&r2=1.4.2.7
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/06/18 18:39:32 1.4.2.6
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/07/24 15:00:30 1.4.2.7
@@ -759,7 +759,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ if form['passwd']:
+ # allow passwords consisting of nothing but whitespace
+ fencedev.addAttribute('passwd', form['passwd'])
+ else:
+ raise Exception, 'blank'
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -1136,6 +1140,11 @@
fenceinst = Device()
fenceinst.addAttribute('name', parent_name)
+ if form.has_key('option'):
+ option = form['option'].strip()
+ if option:
+ fenceinst.addAttribute('option', option)
+
try:
ret = FI_VALIDATE[fence_agent](form, fenceinst)
if len(ret) > 0:
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-08-01 19:53 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-08-01 19:53 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-08-01 19:53:35
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
Reapply accidentally reverted patch that fixes 249097 (allow a space as a valid password char)
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.8&r2=1.4.2.9
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/07/26 04:36:34 1.4.2.8
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/08/01 19:53:34 1.4.2.9
@@ -246,7 +246,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-10-03 2:08 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-10-03 2:08 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-10-03 02:08:14
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
Allow a blank string as a valid password for all types of fences.
Patches:
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.4&r2=1.17.2.5
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/09/21 03:24:12 1.17.2.4
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/10/03 02:08:13 1.17.2.5
@@ -291,7 +291,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -340,7 +344,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -381,7 +389,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -430,7 +442,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -505,7 +521,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -554,7 +574,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -603,7 +627,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -657,7 +685,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -706,7 +738,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -776,12 +812,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- if form['passwd']:
- # allow passwords consisting of nothing but whitespace
- fencedev.addAttribute('passwd', form['passwd'])
- else:
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
raise Exception, 'blank'
-
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -852,7 +887,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-10-03 2:11 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-10-03 2:11 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-10-03 02:11:58
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
Allow a blank string as a valid password for all types of fences.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.25&r2=1.26
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/09/21 03:11:53 1.25
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/10/03 02:11:58 1.26
@@ -168,7 +168,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -217,7 +221,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -258,7 +266,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -307,7 +319,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -382,7 +398,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -431,7 +451,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -480,7 +504,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -534,7 +562,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -583,7 +615,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -653,12 +689,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- if form['passwd']:
- # allow passwords consisting of nothing but whitespace
- fencedev.addAttribute('passwd', form['passwd'])
- else:
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
raise Exception, 'blank'
-
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -729,7 +764,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-10-03 19:44 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-10-03 19:44 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-10-03 19:44:33
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
Fix for dual power check bug when adding new fence instances for the first time to for a node using a shared power fence device
Patches:
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.5&r2=1.17.2.6
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/10/03 02:08:13 1.17.2.5
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/10/03 19:44:33 1.17.2.6
@@ -1199,6 +1199,7 @@
fenceinst = Device()
fenceinst.addAttribute('name', parent_name)
+ fenceinst.setAgentType(fence_agent)
if form.has_key('option'):
option = form['option'].strip()
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2007-12-11 15:54 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2007-12-11 15:54 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-12-11 15:54:16
Modified files:
luci/site/luci/Extensions: FenceHandler.py
Log message:
fix 379461
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.27&r2=1.28
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/10/03 19:40:37 1.27
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/12/11 15:54:16 1.28
@@ -643,6 +643,17 @@
if not has_passwd:
errors.append(FD_PROVIDE_PASSWD)
+ try:
+ modulename = form['modulename'].strip()
+ if not modulename:
+ raise Exception, 'blank'
+ fencedev.addAttribute('modulename', modulename)
+ except Exception, e:
+ try:
+ fencedev.removeAttribute('modulename')
+ except:
+ pass
+
return errors
def val_rps10_fd(form, fencedev):
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py
@ 2010-08-05 19:06 rmccabe
0 siblings, 0 replies; 11+ messages in thread
From: rmccabe @ 2010-08-05 19:06 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 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')
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-08-05 19:06 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-05 19:06 [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.py rmccabe
-- strict thread matches above, loose matches on Subject: below --
2007-12-11 15:54 rmccabe
2007-10-03 19:44 rmccabe
2007-10-03 2:11 rmccabe
2007-10-03 2:08 rmccabe
2007-08-01 19:53 rmccabe
2007-07-24 15:00 rmccabe
2007-01-19 20:57 rmccabe
2006-12-21 3:41 rmccabe
2006-11-09 16:45 jparsons
2006-10-16 19:58 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).