commit 71c0c2311e2ee05c2d0b80c0fcc281ad28ad9169
Author: Jan Pokorny <jpokorny(a)redhat.com>
Date: Wed Jul 17 12:00:00 2013 +0200
Do not propagate "unfencing" verbatim to configuration
Resolves: rhbz#883008
Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com>
luci/validation/validate_fence.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/luci/validation/validate_fence.py b/luci/validation/validate_fence.py
index 8db9277..55d1e8d 100644
--- a/luci/validation/validate_fence.py
+++ b/luci/validation/validate_fence.py
@@ -121,7 +121,7 @@ def config_fence_attr(params, fence, fname, **kw):
try:
# passwords may begin and/or end with blank characters
- if not attr_name in ['passwd', 'vmpasswd',
'snmp_priv_passwd']:
+ if not attr_name in ('passwd', 'vmpasswd',
'snmp_priv_passwd'):
val = val.strip()
if not val:
val = None
@@ -136,7 +136,8 @@ def config_fence_attr(params, fence, fname, **kw):
fence.removeAttribute(attr_name)
except:
pass
- else:
+ # unfencing in passed params (when required) is just internal tracking
+ elif attr_name != 'unfencing':
fence.addAttribute(attr_name, val)
return errors
@@ -1207,7 +1208,7 @@ def val_scsi_fi(fenceinst, parent_name, **kw):
('nodename', False),
('key', False),
('delay', False),
- ('unfencing', True), # just a template sanity-check
+ ('unfencing', True), # just a template sanity-check, not propagated
)
errors = config_fence_attr(params, fenceinst, parent_name, **kw)
@@ -1234,7 +1235,7 @@ def val_eaton_snmp_fi(fenceinst, parent_name, **kw):
def val_sanlock_fi(fenceinst, parent_name, **kw):
params = (
('host_id', True),
- ('unfencing', True), # just a template sanity-check
+ ('unfencing', True), # just a template sanity-check, not propagated
)
errors = config_fence_attr(params, fenceinst, parent_name, **kw)