[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	2008-07-14 21:52:30

Modified files:
	.              : conga.spec.in.in 
	luci/cluster   : cluster_config-macros validate_config_qdisk.js 
	luci/plone-custom: conga.js 
	luci/site/luci/Extensions: LuciValidation.py 
	ricci/modules/rpm: PackageHandler.cpp 

Log message:
	fix bz441581

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.93&r2=1.45.2.94
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_config-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.2&r2=1.3.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_qdisk.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.6&r2=1.4.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.6&r2=1.3.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.4&r2=1.6.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.11&r2=1.9.2.12

--- conga/conga.spec.in.in	2008/07/14 16:29:28	1.45.2.93
+++ conga/conga.spec.in.in	2008/07/14 21:52:29	1.45.2.94
@@ -302,6 +302,7 @@
 - Fix bz430737 (Conga should install the 'cmirror' package when clustered storage is requested)
 - Fix bz379461 (Conga doesn't have the option for modulename for drac fencing)
 - Fix bz433089 (when adding multiple nodes the order is reversed.)
+- Fix bz441581 (Don't allow both label and device for qdisk config if only one can be specified)
 
 * Fri Apr 18 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-8
 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
--- conga/luci/cluster/cluster_config-macros	2008/02/08 21:56:33	1.3.2.2
+++ conga/luci/cluster/cluster_config-macros	2008/07/14 21:52:30	1.3.2.3
@@ -715,21 +715,39 @@
 				</td>
 			</tr>
 
-			<tr class="systemsTable">
-				<td class="systemsTable">Device</td>
-				<td class="systemsTable">
-					<input type="text" name="device"
-						tal:attributes="value clusterinfo/device | nothing" />
-				</td>
-			</tr>
-
-			<tr class="systemsTable">
-				<td class="systemsTable">Label</td>
-				<td class="systemsTable">
-					<input type="text" name="label"
-						tal:attributes="value clusterinfo/label | nothing" />
-				</td>
-			</tr>
+			
+			<tr class="systemsTable"><td colspan="2">
+				<table class="systemsTable">
+					<tr class="systemsTable">
+						<td class="systemsTable">
+							<input type="radio" name="qdisk_dev_label"
+								onclick="disable_text_field(this.form.label, this.form.device)">Label
+						</td>
+						<td class="systemsTable">
+							<input type="text" name="label" id="qdisk_label"
+								onfocus="disable_text_field(this.form.label, this.form.device);this.form.qdisk_dev_label[0].checked='checked';"
+								tal:attributes="
+									disabled python:(clusterinfo.get('label') or not clusterinfo.get('device')) and '' or 'disabled';
+									checked python:(clusterinfo.get('label') or not clusterinfo.get('label')) and 'checked' or '';
+									value clusterinfo/label | nothing" />
+						</td>
+					</tr>
+					<tr class="systemsTable">
+						<td class="systemsTable">
+							<input type="radio" name="qdisk_dev_label"
+								onclick="disable_text_field(this.form.device, this.form.label)">Device (deprecated)
+						</td>
+						<td class="systemsTable">
+							<input type="text" name="device" id="qdisk_device"
+								onfocus="disable_text_field(this.form.device, this.form.label);this.form.qdisk_dev_label[1].checked='checked';"
+								tal:attributes="
+									disabled python:clusterinfo.get('device') and '' or 'disabled';
+									checked python:clusterinfo.get('device') and 'checked' or '';
+									value clusterinfo/device | nothing" />
+						</td>
+					</tr>
+				</table>
+			</td></tr>
 		</table>
 		</div>
 
--- conga/luci/cluster/validate_config_qdisk.js	2008/01/23 04:44:30	1.4.2.6
+++ conga/luci/cluster/validate_config_qdisk.js	2008/07/14 21:52:30	1.4.2.7
@@ -206,6 +206,9 @@
 		var no_label = !form.label || str_is_blank(form.label.value);
 		if (no_dev && no_label)
 			errors.push('You must give either a label or a device.');
+		if (!no_dev && !no_label) {
+			errors.push('You may not specify both a device and a label.');
+		}
 
 		var hnum = document.getElementById('num_heuristics');
 		if (hnum) {
--- conga/luci/plone-custom/conga.js	2008/06/13 18:37:46	1.3.2.6
+++ conga/luci/plone-custom/conga.js	2008/07/14 21:52:30	1.3.2.7
@@ -248,6 +248,12 @@
 	elem.parentNode.removeChild(elem);
 }
 
+function disable_text_field(enable_obj, disable_obj) {
+	disable_obj.value = "";
+	disable_obj.disabled = "disabled";
+	enable_obj.disabled = "";
+}
+
 function swap_tabs(new_label, cur_tab, new_tab) {
 	if (cur_tab == new_tab) {
 		return (cur_tab);
--- conga/luci/site/luci/Extensions/LuciValidation.py	2008/05/12 17:04:41	1.6.2.4
+++ conga/luci/site/luci/Extensions/LuciValidation.py	2008/07/14 21:52:30	1.6.2.5
@@ -725,6 +725,8 @@
 
 	if not device and not label:
 		errors.append('No Device or Label value was given')
+	if device and label:
+		errors.append('You may not specify both device and label')
 
 	num_heuristics = 0
 	try:
--- conga/ricci/modules/rpm/PackageHandler.cpp	2008/07/14 16:00:12	1.9.2.11
+++ conga/ricci/modules/rpm/PackageHandler.cpp	2008/07/14 21:52:30	1.9.2.12
@@ -506,15 +506,17 @@
 		}
 	} else if (RHEL5 || FC6) {
 		set.packages.push_back("gfs2-utils");
-		set.packages.push_back("cmirror");
 		if (RHEL5) {
 			set.packages.push_back("gfs-utils");
 			if (kernel.find("xen") == kernel.npos) {
 				set.packages.push_back("kmod-gfs");
 				set.packages.push_back("kmod-gfs2");
+				set.packages.push_back("cmirror");
+				set.packages.push_back("kmod-cmirror");
 			} else {
 				set.packages.push_back("kmod-gfs-xen");
 				set.packages.push_back("kmod-gfs2-xen");
+				set.packages.push_back("kmod-cmirror-xen");
 			}
 		}
 	}