From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 6 Nov 2007 19:58:02 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/form-mac ...
Message-ID: <20071106195802.13939.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-11-06 19:58:01

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : form-macros 
	luci/site/luci/Extensions: LuciClusterInfo.py 
	                           cluster_adapters.py 

Log message:
	fix 337041: Add option to not fail-back service

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.88&r2=1.89
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.215&r2=1.216
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.273&r2=1.274

--- conga/conga.spec.in.in	2007/10/09 21:41:46	1.88
+++ conga/conga.spec.in.in	2007/11/06 19:58:00	1.89
@@ -298,6 +298,8 @@
 - Fixed bz249619 (luci "Manage Systems and Clusters" display of clusters and storage systems is cascaded)
 - Fixed bz315631 (conga doesn't handle the cluster restart operation properly)
 - Fixed bz320411 (conga should use the node name in cluster.conf and not FQDN for fencing)
+- Fixed bz253727 (RFE: graphical view should be default in partiton tables view)
+- Fixed bz337041 (Add option to not fail-back service)
 
 * Mon Aug 27 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6
 - Fixed bz253783
--- conga/luci/cluster/form-macros	2007/09/27 21:42:15	1.215
+++ conga/luci/cluster/form-macros	2007/11/06 19:58:00	1.216
@@ -4867,6 +4867,13 @@
 		</strong>
 	</div>
 
+	<tal:block tal:define="nofailback python:fdom.get('nofailback')">
+		<div class="formordered"
+			tal:condition="python:nofailback is True">
+			<h4>Services running in this failover domain will not be failed back.
+		</div>
+	</tal:block>
+
 	<div class="fdomrestricted">
 		<h4>This Failover Domain is <span tal:replace="python: fdom['restricted'] == True and 'Restricted' or 'Unrestricted'"/></h4>
 	</div>
@@ -4930,7 +4937,7 @@
 	<table class="systemsTable" width="100%">
 		<thead class="systemsTable">
 			<tr class="systemsTable">
-				<td><strong>Failover Domain Name</strong></td>
+				<td width="60%"><strong>Failover Domain Name</strong></td>
 				<td>
 					<input type="text" name="name"
 						tal:attributes="value fdom/name | nothing" />
@@ -4952,6 +4959,13 @@
 				</td>
 			</tr>
 			<tr class="systemsTable">
+				<td>Do not fail back services in this domain</td>
+				<td>
+					<input type="checkbox" name="nofailback"
+						tal:attributes="checked python: (fdom and 'nofailback' in fdom and fdom['nofailback'] == '1') and 'checked' or ''" />
+				</td>
+			</tr>
+			<tr class="systemsTable">
 				<td class="systemsTable" colspan="2">
 					<p></p>
 					<p class="reshdr">Failover domain membership</p>
--- conga/luci/site/luci/Extensions/LuciClusterInfo.py	2007/09/21 16:06:52	1.15
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py	2007/11/06 19:58:00	1.16
@@ -453,6 +453,13 @@
 	else:
 		fhash['prioritized'] = '0'
 
+	
+	nofailback = fdom.getAttribute('nofailback')
+	if nofailback is not None and (nofailback == 'true' or nofailback == '1'):
+		fhash['nofailback'] = '1'
+	else:
+		fhash['nofailback'] = '0'
+
 	restricted_attr = fdom.getAttribute('restricted')
 	if restricted_attr is not None and (restricted_attr == 'true' or restricted_attr == '1'):
 		fhash['restricted'] = '1'
@@ -504,6 +511,12 @@
 		else:
 			fdom_map['restricted'] = False
 
+		nofailback = fdom.getAttribute('nofailback')
+		if nofailback is not None and (nofailback == 'true' or nofailback == '1'):
+			fdom_map['nofailback'] = True
+		else:
+			fdom_map['nofailback'] = False
+
 		nodelist = list()
 		for node in fdom.getChildren():
 			nodesmap = {}
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/10/09 21:31:05	1.273
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/11/06 19:58:00	1.274
@@ -1931,6 +1931,12 @@
 	except:
 		restricted = False
 
+	nofailback = False
+	try:
+		nofailback = request.form.has_key('nofailback')
+	except:
+		nofailback = False
+
 	oldname = fvar['oldname']
 
 	if oldname is None or oldname != name:
@@ -1964,6 +1970,11 @@
 	else:
 		fdom.addAttribute('restricted', '0')
 
+	if nofailback:
+		fdom.addAttribute('nofailback', '1')
+	else:
+		fdom.addAttribute('nofailback', '0')
+
 	for i in model.getNodeNames():
 		if request.form.has_key(i):
 			fdn = FailoverDomainNode()