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

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

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2009-03-24 20:06:42

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : cluster_svc-macros 
	luci/site/luci/Extensions: LuciClusterInfo.py 
	make           : version.in 

Log message:
	rework fix for bz483775

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.112&r2=1.45.2.113
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.8&r2=1.3.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.16&r2=1.1.4.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.49&r2=1.21.2.50

--- conga/conga.spec.in.in	2009/02/16 17:23:27	1.45.2.112
+++ conga/conga.spec.in.in	2009/03/24 20:06:39	1.45.2.113
@@ -323,13 +323,18 @@
 
 ###  changelog ###
 %changelog
+* Tue Mar 24 2009 Ryan McCabe <rmccabe@redhat.com> 0.12.2-4
+- Rework fix for bz483775 (Failover Domains can't be set for VMs as services of cluster suite using Conga)
+
+* Mon Mar 16 2009 Ryan McCabe <rmccabe@redhat.com> 0.12.2-3
+- Fix bz483769 (Conga always shows VM properties as "Run exclusive")
+
 * Thu Jan 22 2009 Ryan McCabe <rmccabe@redhat.com> 0.12.2-1
 - Fix bz452704 (Unable to add existing RHEL4 clusters with RHEL5.2 Luci)
 - Fix bz467464 (adding qdisk to existing cluster fails to update cman entry in cluster.conf)
 - Fix bz460038 (Conga fs resource error when editing service)
 - Fix bz483067 (adding resource in conga doesn't work in IE)
 - Fix bz483775 (Failover Domains can't be set for VMs as services of cluster suite using Conga)
-- Fix bz483769 (Conga always shows VM properties as "Run exclusive")
 - Fix bz450007 (cannot remove shared fence device through luci)
 - Fix bz466013 (Add luci GUI support for LPAR and vmware fencing)
 - Fix bz459160 (fenced config option to skip nodes with undefined fencing)
--- conga/luci/cluster/cluster_svc-macros	2008/09/18 15:19:34	1.3.2.8
+++ conga/luci/cluster/cluster_svc-macros	2009/03/24 20:06:41	1.3.2.9
@@ -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/site/luci/Extensions/LuciClusterInfo.py	2009/03/09 21:26:41	1.1.4.16
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py	2009/03/24 20:06:41	1.1.4.17
@@ -761,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()
--- conga/make/version.in	2009/01/29 16:23:21	1.21.2.49
+++ conga/make/version.in	2009/03/24 20:06:41	1.21.2.50
@@ -1,2 +1,2 @@
 VERSION=0.12.2
-RELEASE=1
+RELEASE=4