[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./conga.spec.in.in luci/cluster/cluster_ ...



CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe sourceware org	2009-04-15 16:07:14

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : cluster_svc-macros fence-macros 
	luci/site/luci/Extensions: FenceHandler.py LuciClusterInfo.py 
	luci/site/luci/var: Data.fs 
	make           : version.in 

Log message:
	* Mon Apr 15 2009 Ryan McCabe <rmccabe redhat com> 0.11.2-2
	- Fix bz494956 (Odd error display when creating a cluster)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.34&r2=1.67.2.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.7.2.2&r2=1.7.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.4.7&r2=1.2.4.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.17.2.11&r2=1.17.2.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.10.2.8&r2=1.10.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.20.2.28&r2=1.20.2.29
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.15&r2=1.28.2.16

--- conga/conga.spec.in.in	2008/11/25 16:37:18	1.67.2.34
+++ conga/conga.spec.in.in	2009/04/15 16:05:43	1.67.2.35
@@ -301,6 +301,9 @@
 
 
 %changelog
+* Mon Apr 15 2009 Ryan McCabe <rmccabe redhat com> 0.11.2-2
+- Fix bz494956 (Odd error display when creating a cluster)
+
 * Mon Nov 25 2008 Ryan McCabe <rmccabe redhat com> 0.11.2-1
 - Fix bz458298 (Cannot create new cluster in luci, python syntax error)
 - Fix bz441583 (Don't allow both label and device for qdisk config if only one can be specified)
--- conga/luci/cluster/cluster_svc-macros	2008/11/10 21:02:43	1.7.2.2
+++ conga/luci/cluster/cluster_svc-macros	2009/04/15 16:05:47	1.7.2.3
@@ -544,6 +544,7 @@
 			<select name="domain">
 				<option value=""
 					tal:attributes="selected python:(not sinfo or not sinfo.get('domain')) and 'selected' or ''">None</option>
+
 				<tal:block tal:condition="exists:sinfo/fdoms">
 				<tal:block tal:repeat="f sinfo/fdoms">
 					<option tal:content="f" tal:attributes="
@@ -551,6 +552,14 @@
 						selected python:(sinfo and sinfo.get('domain') == f) and 'selected' or ''" />
 				</tal:block>
 				</tal:block>
+
+				<tal:block tal:condition="not:exists:sinfo/fdoms">
+					<tal:block tal:condition="exists:clusterinfo/fdoms">
+					<tal:block tal:repeat="f clusterinfo/fdoms">
+						<option tal:content="f" tal:attributes="value f" />
+					</tal:block>
+					</tal:block>
+				</tal:block>
 			</select>
 		</td>
 	</tr>
--- conga/luci/cluster/fence-macros	2009/02/17 20:48:57	1.2.4.7
+++ conga/luci/cluster/fence-macros	2009/04/15 16:05:47	1.2.4.8
@@ -333,7 +333,7 @@
 	<option name="fence_bullpap" value="fence_bullpap">Bull PAP</option>
 	<option name="fence_xvm" value="fence_xvm">Virtual Machine Fencing</option>
 	<option name="fence_scsi" value="fence_scsi">SCSI Fencing</option>
-	<option name="fence_vmware" value="fence_vmware">VMWare Fencing</option>
+	<option name="fence_vmware" value="fence_vmware">VMware Fencing</option>
 	<option name="fence_lpar" value="fence_lpar">LPAR Fencing</option>
 </div>
 
@@ -357,7 +357,7 @@
 	<option name="fence_ipmilan" value="fence_ipmilan">IPMI Lan</option>
 	<option name="fence_xvm" value="fence_xvm">Virtual Machine Fencing</option>
 	<option name="fence_scsi" value="fence_scsi">SCSI Fencing</option>
-	<option name="fence_vmware" value="fence_vmware">VMWare Fencing</option>
+	<option name="fence_vmware" value="fence_vmware">VMware Fencing</option>
 	<option name="fence_lpar" value="fence_lpar">LPAR Fencing</option>
 	<option name="fence_manual" value="fence_manual">Manual Fencing</option>
 </div>
@@ -633,19 +633,6 @@
 							value cur_fencedev/passwd_script | nothing" />
 				</td>
 			</tr>
-			<tr tal:condition="exists:clusterinfo/has_fence_ssh">
-				<td>
-					<span title="Enable SSH operation">Use SSH</span>
-				</td>
-				<td>
-					<input tal:condition="exists:cur_fencedev"
-						type="checkbox" name="secure"
-						tal:attributes="
-							checked python:(cur_fencedev and cur_fencedev.has_key('secure') and (cur_fencedev['secure'] == '1' or cur_fencedev['secure'].lower() == 'true')) and 'checked' or ''" />
-					<input tal:condition="not:exists:cur_fencedev"
-						type="checkbox" name="secure" />
-				</td>
-			</tr>
 		</table>
 
 		<tal:block tal:condition="exists: cur_fencedev">
@@ -1172,7 +1159,7 @@
 		<table>
 			<tr>
 				<td><strong class="cluster">Fence Type</strong></td>
-				<td>VMWare</td>
+				<td>VMware</td>
 			</tr>
 			<tr>
 				<td>Name</td>
--- conga/luci/site/luci/Extensions/FenceHandler.py	2009/02/17 20:49:01	1.17.2.11
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2009/04/15 16:05:48	1.17.2.12
@@ -967,12 +967,6 @@
 	if not has_passwd:
 		errors.append(FD_PROVIDE_PASSWD)
 
-	use_ssh = form.has_key('secure') and (form['secure'] == '1' or form['secure'].lower() == 'true')
-	if use_ssh:
-		fencedev.addAttribute('secure', '1')
-	else:
-		fencedev.removeAttribute('secure')
-
 	return errors
 
 FD_VALIDATE = {
--- conga/luci/site/luci/Extensions/LuciClusterInfo.py	2009/02/17 20:49:01	1.10.2.8
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py	2009/04/15 16:05:48	1.10.2.9
@@ -594,6 +594,7 @@
 
 	clumap = {}
 
+	clumap['has_ignore_undef_fence'] = False
 	try:
 		cluster_os = model.getClusterOS()
 		if cluster_os.find('Tikanga') != -1:
@@ -604,7 +605,7 @@
 				clumap['vm_migration_choice'] = True
 			if os_minor > 2:
 				clumap['has_fence_ssh'] = True
-				clumap['has_ignore_undef_fence'] = True
+				#clumap['has_ignore_undef_fence'] = True
 		elif cluster_os.find('Nahant') != -1:
 			clumap['os_major'] = 4
 			os_minor = int(cluster_os[cluster_os.find('Update ') + 7])
@@ -760,6 +761,11 @@
 			hlist.append(hmap)
 	clumap['hlist'] = hlist
 
+	try:
+		clumap['fdoms'] = get_fdom_names(model)
+	except:
+		clumap['fdoms'] = None
+
 	if model.has_errors():
 		clumap['has_errors'] = True
 		clumap['errmsgs'] = model.get_errmsgs()
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2009/02/17 20:49:02	1.20.2.28 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2009/04/15 16:05:48	1.20.2.29 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/make/version.in	2008/07/03 15:01:27	1.28.2.15
+++ conga/make/version.in	2009/04/15 16:07:14	1.28.2.16
@@ -1,2 +1,2 @@
 VERSION=0.11.2
-RELEASE=1
+RELEASE=2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]