[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-01-31 19:28:08

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

Log message:
	More GULM deploy tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.220&r2=1.221
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.55&r2=1.56

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/31 18:50:29	1.220
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/31 19:28:08	1.221
@@ -557,7 +557,8 @@
 								True,
 								shared_storage,
 								False,
-								download_pkgs)
+								download_pkgs,
+								model.GULM_ptr is not None)
 				if not batch_node:
 					raise Exception, 'batch is blank'
 				system_list[x]['batch'] = batch_node
--- conga/luci/site/luci/Extensions/ricci_bridge.py	2007/01/31 05:26:45	1.55
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/01/31 19:28:08	1.56
@@ -47,7 +47,8 @@
 			install_services,
 			install_shared_storage,
 			install_LVS,
-			upgrade_rpms):
+			upgrade_rpms,
+			gulm):
 	
 	batch = '<?xml version="1.0" ?>'
 	batch += '<batch>'
@@ -63,7 +64,10 @@
 	batch += '"/>'
 	batch += '<var name="sets" type="list_xml">'
 	if install_base or install_services or install_shared_storage:
-		batch += '<set name="Cluster Base"/>'
+		if gulm:
+			batch += '<set name="Cluster Base - Gulm"/>'
+		else:
+			batch += '<set name="Cluster Base"/>'
 	if install_services:
 		batch += '<set name="Cluster Service Manager"/>'
 	if install_shared_storage:
@@ -80,7 +84,10 @@
 	batch += '<function_call name="disable">'
 	batch += '<var mutable="false" name="services" type="list_xml">'
 	if install_base or install_services or install_shared_storage:
-		batch += '<set name="Cluster Base"/>'
+		if gulm:
+			batch += '<set name="Cluster Base - Gulm"/>'
+		else:
+			batch += '<set name="Cluster Base"/>'
 	if install_services:
 		batch += '<set name="Cluster Service Manager"/>'
 	if install_shared_storage:
@@ -170,7 +177,10 @@
 	batch += '"/>'
 	batch += '<var name="sets" type="list_xml">'
 	if install_base or install_services or install_shared_storage:
-		batch += '<set name="Cluster Base"/>'
+		if gulm_lockservers:
+			batch += '<set name="Cluster Base - Gulm"/>'
+		else:
+			batch += '<set name="Cluster Base"/>'
 	if install_services:
 		batch += '<set name="Cluster Service Manager"/>'
 	if install_shared_storage:
@@ -187,7 +197,10 @@
 	batch += '<function_call name="disable">'
 	batch += '<var mutable="false" name="services" type="list_xml">'
 	if install_base or install_services or install_shared_storage:
-		batch += '<set name="Cluster Base"/>'
+		if gulm_lockservers:
+			batch += '<set name="Cluster Base - Gulm"/>'
+		else:
+			batch += '<set name="Cluster Base"/>'
 	if install_services:
 		batch += '<set name="Cluster Service Manager"/>'
 	if install_shared_storage: