CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [email protected] 2010-08-05 18:01:16
Modified files:
luci/cluster : cluster_config-macros
validate_config_multicast.js
Log message:
luci: Fix for rhbz#bz582348.patch
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_config-macros.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/cluster/validate_config_multicast.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.4&r2=1.3.2.5
--- conga/luci/cluster/cluster_config-macros 2009/05/21 13:32:03 1.3.2.6
+++ conga/luci/cluster/cluster_config-macros 2010/08/05 18:01:15 1.3.2.7
@@ -621,10 +621,10 @@
value
clusterinfo/mcast_addr |nothing" />
</td>
</tr>
+
+ <tal:block tal:condition="python:os_version ==
'rhel4'">
<tr class="systemsTable">
- <td class="systemsTable">
- Multicast network interface
<span tal:condition="python:os_version != 'rhel4'">(optional)</span>
- </td>
+ <td class="systemsTable">Multicast
network interface</td>
<td class="systemsTable">
<input type="text"
name="mcast_interface"
id="mcast_interface"
@@ -633,6 +633,7 @@
value
clusterinfo/mcast_interface |nothing" />
</td>
</tr>
+ </tal:block>
</tbody>
<tfoot class="systemsTable">
--- conga/luci/cluster/validate_config_multicast.js 2008/02/07 06:52:55
1.3.2.4
+++ conga/luci/cluster/validate_config_multicast.js 2010/08/05 18:01:15
1.3.2.5
@@ -66,7 +66,9 @@
clr_form_err(form.mcast[0]);
clr_form_err(form.mcast[1]);
clr_form_err(form.mcast_address);
- clr_form_err(form.mcast_interface);
+ if (form.cluster_version && form.cluster_version.value ==
'rhel4') {
+ clr_form_err(form.mcast_interface);
+ }
}
if (mcast == 1) {
