From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 19 Jul 2006 22:50:13 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py
Message-ID: <20060719225013.29118.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-19 22:50:13

Modified files:
	luci/site/luci/Extensions: ricci_bridge.py 

Log message:
	fix error in batch command construction

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/19 22:28:17	1.7
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/19 22:50:13	1.8
@@ -556,7 +556,11 @@
         batch += '<clusternode name="' + i + '" votes="1" />'
     batch += '</clusternodes>'
 
-    batch += '<cman/>'
+    if len(nodeList) == 2:
+        batch += '<cman expected_votes="1" two_node="1"/>'
+    else:
+        batch += '<cman/>'
+ 
     batch += '<fencedevices/>'
     batch += '<rm/>'
     batch += '</cluster>'
@@ -567,7 +571,9 @@
     
     batch += '<module name="cluster">'
     batch += '<request API_version="1.0">'
-    batch += '<function_call name="start_node" cluster_startup="true"/>'
+    batch += '<function_call name="start_node">'
+    batch += '<var mutable="false" name="cluster_startup" type="boolean" value="true"/>'
+    batch += '</function_call>'
     batch += '</request>'
     batch += '</module>'
     batch += '</batch>'