From 9c549d3ddd744dd817a4ecb1bbf434bedb86eb0b Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 20 Sep 2011 07:13:01 +0000
Subject: [PATCH] create image on the web gui can support ganglia install

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10566 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/js/provision/images.js | 16 ++++++++++------
 xCAT-UI/xcat/plugins/web.pm    |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/xCAT-UI/js/provision/images.js b/xCAT-UI/js/provision/images.js
index 545936aec..3ccd908e9 100644
--- a/xCAT-UI/js/provision/images.js
+++ b/xCAT-UI/js/provision/images.js
@@ -13,6 +13,7 @@ var softwareList = {
 	"essl" : ["essl.3232.rte", "essl.3264.rte", "essl.6464.rte", "essl.common", "essl.license", "essl.man", "essl.msg", "essl.rte", "ibm-java2", "pessl.common", "pessl.license", "pessl.man",
 			"pessl.msg", "pessl.rte.ppe"],
 	"loadl" : ["IBMJava2", "LoadL-full-license-RH6", "LoadL-resmgr-full-RH6", "LoadL-scheduler-full-RH6"],
+	"ganglia" : ["rrdtool", "ganglia", "ganglia-gmetad", "ganglia-gmond"],
 	"base" : ["createrepo"]
 };
 
@@ -394,10 +395,13 @@ function createHpcSelect(container) {
 	hpcFieldset.append(createInfoBar(str));
 	
 	// Advanced software when select the compute profile
-	str = '<ul><li id="gpfsli"><input type="checkbox" onclick="softwareCheck(this)" name="gpfs">GPFS</li>'
-		+ '<li id="rsctli"><input type="checkbox" onclick="softwareCheck(this)" name="rsct">RSCT</li>' + '<li id="peli"><input type="checkbox" onclick="softwareCheck(this)" name="pe">PE</li>'
-		+ '<li id="esslli"><input type="checkbox" onclick="esslCheck(this)" name="essl">ESSl&PESSL</li>' 
-	+ '</ul>';
+	str = '<div id="partlysupport"><ul><li id="gpfsli"><input type="checkbox" onclick="softwareCheck(this)" name="gpfs">GPFS</li>' +
+		'<li id="rsctli"><input type="checkbox" onclick="softwareCheck(this)" name="rsct">RSCT</li>' + 
+		'<li id="peli"><input type="checkbox" onclick="softwareCheck(this)" name="pe">PE</li>' + 
+		'<li id="esslli"><input type="checkbox" onclick="esslCheck(this)" name="essl">ESSl&PESSL</li>' + 
+		'</ul></div>' +
+		'<div><ul><li id="gangliali"><input type="checkbox" onclick="softwareCheck(this)" name="ganglia">Ganglia</li>' +
+		'</ul></div>';
 	hpcFieldset.append(str);
 
 	container.append($('<div></div>').append(hpcFieldset));
@@ -595,9 +599,9 @@ function hpcShow() {
 	// The current UI only supports RHELS 6
 	// If you want to support all, delete the subcheck
 	if ($('#createImageTab #osvers').attr('value') != "rhels6" || $('#createImageTab #osarch').attr('value') != "ppc64" || $('#createImageTab #profile').attr('value') != "compute") {
-		$('#createImageTab #hpcsoft').hide();
+		$('#createImageTab #partlysupport').hide();
 	} else {
-		$('#createImageTab #hpcsoft').show();
+		$('#createImageTab #partlysupport').show();
 	}
 }
 
diff --git a/xCAT-UI/xcat/plugins/web.pm b/xCAT-UI/xcat/plugins/web.pm
index 5413a3b75..69b49cea3 100644
--- a/xCAT-UI/xcat/plugins/web.pm
+++ b/xCAT-UI/xcat/plugins/web.pm
@@ -1186,6 +1186,8 @@ sub web_createimage {
 				web_peConfigure( $ostype, $profile, $osarch, $installdir );
 			} elsif ( 'essl' eq $soft ) {
 				web_esslConfigure( $ostype, $profile, $osarch, $installdir );
+			} elsif ( 'ganglia' eq $soft) {
+				web_gangliaConfig( $ostype, $profile, $osarch, 'netboot', $installdir);
 			}
 		}