[Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-19 21:02:32

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

Log message:
	support specifying a cluster alias for creation

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

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/19 20:57:39	1.4
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/19 21:02:32	1.5
@@ -514,7 +514,7 @@
 
       return False
 
-def createClusterBatch(cluster_name, nodeList, services, shared_storage, LVS):
+def createClusterBatch(cluster_name, cluster_alias, nodeList, services, shared_storage, LVS):
     batch = '<?xml version="1.0" ?>'
     batch += '<batch>'
     batch += '<module name="rpm">'
@@ -548,7 +548,7 @@
     batch += '<function_call name="set_cluster.conf">'
     batch += '<var mutable="false" name="propagate" type="boolean" value="false"/>'
     batch += '<var mutable="false" name="cluster.conf" type="xml">'
-    batch += '<cluster config_version="1" name="' + cluster_name + '">'
+    batch += '<cluster config_version="1" name="' + cluster_name + '" alias="' + cluster_alias + '">'
     batch += '<fence_daemon post_fail_delay="0" post_join_delay="3"/>'
 
     batch += '<clusternodes>'