[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Thu May 3 19:51:22 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-05-03 19:51:21
Modified files:
luci/site/luci/Extensions: cluster_adapters.py
Log message:
Add "nodename" attribute for fence_manual instances.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.254&r2=1.255
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/04/02 16:35:13 1.254
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/05/03 19:51:21 1.255
@@ -1878,7 +1878,10 @@
# Add back the tags under the method block
# for the fence instance
- instance_list.append({'name': fencedev_name })
+ if fence_type == 'fence_manual':
+ instance_list.append({'name': fencedev_name, 'nodename': nodename })
+ else:
+ instance_list.append({'name': fencedev_name })
else:
# The user created a new fence device.
retcode, retmsg = validateNewFenceDevice(fence_form, model)
@@ -1892,7 +1895,10 @@
# so the appropriate XML goes into the <method> block inside
# <node><fence>. All we need for that is the device name.
if not 'sharable' in fence_form:
- instance_list.append({'name': fencedev_name })
+ if fence_type == 'fence_manual':
+ instance_list.append({'name': fencedev_name, 'nodename': nodename })
+ else:
+ instance_list.append({'name': fencedev_name })
if fencedev_unknown is True:
# Save any instances for this fence device.
More information about the Cluster-devel
mailing list