CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2007-07-26 04:16:46
Modified files:
luci/cluster : form-macros index_html
luci/homebase : validate_cluster_add.js
Log message:
Fix for 249091
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.90.2.25&r2=1.90.2.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.12&r2=1.20.2.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/validate_cluster_add.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.4&r2=1.4.2.5
--- conga/luci/cluster/form-macros 2007/07/12 04:41:39 1.90.2.25
+++ conga/luci/cluster/form-macros 2007/07/26 04:16:46 1.90.2.26
@@ -270,7 +270,7 @@
<tr class="systemsTable"><td colspan="2"
class="systemsTable">
<input type="checkbox"
name="enable_storage"
tal:attributes="
- checked
add_cluster/shared_storage | nothing" />
+ checked
add_cluster/shared_storage |string:checked" />
Enable Shared Storage Support
</td></tr>
<tr class="systemsTable"><td colspan="2"
class="systemsTable">
@@ -515,6 +515,7 @@
tal:attributes="value cur_sysnum" />
<div class="hbSubmit" id="hbSubmit">
+ <input type="hidden" name="cluster_create" value="1" />
<input type="button" name="Submit" value="Submit"
onClick="validate_cluster_create(this.form)" />
</div>
@@ -2567,6 +2568,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_apc" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2610,6 +2613,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_egenera" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2646,6 +2651,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_wti" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2682,6 +2689,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_brocade" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2718,6 +2727,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_vixel" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2754,6 +2765,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_sanbox2" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2790,6 +2803,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_mcdata" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2826,6 +2841,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_gnbd" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2862,6 +2879,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type"
value="fence_bladecenter" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2898,6 +2917,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_bullpap" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2921,6 +2942,8 @@
</tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_scsi" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -2957,6 +2980,8 @@
</td></tr>
</table>
+ <input type="hidden" name="option"
tal:condition="exists:cur_instance"
+ tal:attributes="value cur_instance/option |nothing" />
<input type="hidden" name="fence_type" value="fence_xvm" />
<input type="hidden" name="fence_instance" value="1" />
<input tal:condition="exists: cur_instance"
@@ -3116,7 +3141,7 @@
<option tal:attributes="value
nodeinfo/delete_url"
tal:condition="python: not
'ricci_error' in nodeinfo">
Delete this node</option>
- <option tal:attributes="value
nodeinfo/force_delete_url"
+ <option tal:attributes="value
nodeinfo/force_delete_url | nothing"
tal:condition="python:
'ricci_error' in nodeinfo">
Force the deletion of this
node</option>
</select>
--- conga/luci/cluster/index_html 2007/07/12 04:41:39 1.20.2.12
+++ conga/luci/cluster/index_html 2007/07/26 04:16:46 1.20.2.13
@@ -44,7 +44,7 @@
<tal:block tal:condition="firsttime">
<tal:block tal:define="global busywaiting
python:True" />
<meta http-equiv="refresh"
- tal:attributes="content
isBusy/refreshurl | python:'3%surl=/luci/cluster' % chr(0x3b)" />
+ tal:attributes="content
isBusy/refreshurl | python:'5%surl=/luci/cluster' % chr(0x3b)" />
</tal:block>
<tal:block tal:define="global busy isBusy/busy |
nothing" />
@@ -52,7 +52,7 @@
<tal:block tal:condition="busy">
<tal:block tal:define="global busywaiting
python:True" />
<meta http-equiv="refresh"
- tal:attributes="content
isBusy/refreshurl | python:'3%surl=/luci/cluster' % chr(0x3b)" />
+ tal:attributes="content
isBusy/refreshurl | python:'5%surl=/luci/cluster' % chr(0x3b)" />
</tal:block>
</tal:block>
</metal:headslot>
--- conga/luci/homebase/validate_cluster_add.js 2007/07/12 04:41:39 1.4.2.4
+++ conga/luci/homebase/validate_cluster_add.js 2007/07/26 04:16:46 1.4.2.5
@@ -43,9 +43,13 @@
if (!view_certs || !view_certs.checked) {
var confirm_str = '';
if (form.addnode) {
- confirm_str = 'Add ' + (added_storage.length > 1 ?
'these nodes' : 'this node') + ' to the \"' + clustername + '\" cluster?';
+ confirm_str = 'Add ' + (added_storage.length > 1 ?
'these nodes' : 'this node') + ' to the \"' + clustername + '\" cluster?\nEach
node added will be rebooted during this process.';
} else {
- confirm_str = 'Add the cluster \"' + clustername + '\"
to the Luci management interface?';
+ if (form.cluster_create) {
+ confirm_str = 'All nodes added to this cluster
will be rebooted as part of this process.\n\nCreate cluster \"' + clustername +
'\"?';
+ } else {
+ confirm_str = 'Add the cluster \"' +
clustername + '\" to the Luci management interface?';
+ }
}
if (confirm(confirm_str)) {
