[Cluster-devel] conga/luci cluster/fence_device.js cluster/for ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Wed Aug 8 21:18:48 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-08-08 21:18:46
Modified files:
luci/cluster : fence_device.js form-chooser form-macros
resource_form_handlers.js
validate_config_fence.js
validate_config_general.js
validate_config_gulm.js
validate_config_multicast.js
validate_config_qdisk.js
validate_create_gulm.js validate_fdom.js
validate_fence.js
Added files:
luci/cluster : validate_xvm_key.js
luci/plone-custom: conga_ajax.js
Log message:
Fix 230451, pass 4
- luci frontend support for managing fence_xvm keys, pass 1
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_xvm_key.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence_device.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.6&r2=1.2.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.12.2.5&r2=1.12.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.90.2.27&r2=1.90.2.28
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.10&r2=1.20.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_fence.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3&r2=1.3.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_general.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.1&r2=1.3.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_gulm.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.4.1&r2=1.3.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_multicast.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3&r2=1.3.2.1
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.3&r2=1.4.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_create_gulm.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.1&r2=1.1.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fdom.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.4.1&r2=1.3.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fence.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.5&r2=1.1.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga_ajax.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=NONE&r2=1.2.2.1
/cvs/cluster/conga/luci/cluster/validate_xvm_key.js,v --> standard output
revision 1.1.2.1
--- conga/luci/cluster/fence_device.js 2007/07/12 04:41:39 1.2.2.6
+++ conga/luci/cluster/fence_device.js 2007/08/08 21:18:46 1.2.2.7
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
var num_fences_level = [ 0, 0 ];
var num_fence_instances = [];
--- conga/luci/cluster/form-chooser 2007/03/12 04:22:25 1.12.2.5
+++ conga/luci/cluster/form-chooser 2007/08/08 21:18:46 1.12.2.6
@@ -152,11 +152,12 @@
<span tal:omit-tag="" tal:condition="python: ptype == '55'">
<div metal:use-macro="here/form-macros/macros/fencedevprocess-form"/>
</span>
-
<span tal:omit-tag="" tal:condition="python: ptype == '80'">
<div metal:use-macro="here/form-macros/macros/conf_editor-form"/>
</span>
-
+ <tal:block tal:condition="python: ptype == '1000'">
+ <div metal:use-macro="here/form-macros/macros/get-cluster-members-form"/>
+ </tal:block>
</span>
</metal:choose-form>
</body>
--- conga/luci/cluster/form-macros 2007/07/26 20:31:05 1.90.2.27
+++ conga/luci/cluster/form-macros 2007/08/08 21:18:46 1.90.2.28
@@ -531,6 +531,12 @@
<script type="text/javascript">
set_page_title('Luci — cluster — Configure cluster properties');
</script>
+ <script type="text/javascript"
+ src="conga_ajax.js">
+ </script>
+ <script type="text/javascript"
+ src="validate_xvm_key.js">
+ </script>
<tal:block tal:define="
global ricci_agent ri_agent | python: here.getRicciAgentForCluster(request)" />
@@ -917,7 +923,7 @@
</div>
<div id="configTabContent" tal:condition="python: configTabNum == 2">
- <form name="fencedaemon" method="post" action="">
+ <form name="fencedaemon" method="post" id="fence_config_form" action="">
<input type="hidden" name="configtype" value="fence" />
<input type="hidden" name="pagetype"
tal:attributes="value request/pagetype | request/form/pagetype"
@@ -967,6 +973,68 @@
tal:attributes="checked python: ('fence_xvmd' in clusterinfo and clusterinfo['fence_xvmd']) and 'checked' or ''" />
</td>
</tr>
+ <tr class="systemsTable">
+ <td class="systemsTable" colspan="2">
+ <div class="systemsTableTop"> </div>
+ <strong>XVM fence daemon key distribution</strong>
+ </td>
+ </tr>
+
+ <tr id="fence_xvm_config" class="invisible">
+ <td class="systemsTable" colspan="2" id="fence_xvm_config">
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <div id="fence_xvm_hosts" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ <input type="button" name="distribute"
+ value="Create and distribute keys"
+ onclick="validate_xvm_dist_form(this.form)"
+ />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <tr class="systemsTable" id="fence_xvm_init">
+ <td class="systemsTable" colspan="2">
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ Enter a node hostname from the host cluster
+ </td>
+ <td>
+ <input type="text" value=""
+ name="host_cluster_name"
+ id="host_cluster_name" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">
+ Enter a node hostname from the hosted (virtual) cluster
+ </td>
+ <td>
+ <input type="text" value=""
+ name="virt_cluster_name"
+ id="virt_cluster_name" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable" colspan="2">
+ <input type="button"
+ name="Retrieve cluster nodes"
+ value="Retrieve cluster nodes"
+ onclick="get_cluster_members(this.form)"
+ />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</tbody>
<tfoot class="systemsTable">
@@ -974,7 +1042,8 @@
<td class="systemsTable" colspan="2">
<div class="systemsTableEnd">
<input type="button" value="Apply"
- onClick="validate_form(this.form);" />
+ id="fence_config_submit"
+ onClick="validate_form(this.form)" />
</div>
</td>
</tr>
@@ -5301,6 +5370,10 @@
</form>
</div>
+<div metal:define-macro="get-cluster-members-form">
+ <tal:block tal:define="ret python: here.get_cluster_nodes_async(request)" />
+</div>
+
<div metal:define-macro="system-svc-update-form">
<tal:block tal:define="ret python: here.validate_manage_svc(request)" />
</div>
--- conga/luci/cluster/resource_form_handlers.js 2007/07/27 19:11:32 1.20.2.10
+++ conga/luci/cluster/resource_form_handlers.js 2007/08/08 21:18:46 1.20.2.11
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
function swap_in_global_res(container_id, sel, replace, form) {
sel.id = null;
var container = document.getElementById(container_id);
--- conga/luci/cluster/validate_config_fence.js 2006/10/04 16:39:07 1.3
+++ conga/luci/cluster/validate_config_fence.js 2007/08/08 21:18:46 1.3.2.1
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
function validate_form(form) {
var errors = new Array();
--- conga/luci/cluster/validate_config_general.js 2007/03/01 00:31:08 1.3.2.1
+++ conga/luci/cluster/validate_config_general.js 2007/08/08 21:18:46 1.3.2.2
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
function validate_form(form) {
var errors = new Array();
var name = null;
--- conga/luci/cluster/validate_config_gulm.js 2007/03/01 00:31:08 1.3.4.1
+++ conga/luci/cluster/validate_config_gulm.js 2007/08/08 21:18:46 1.3.4.2
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
function validate_form(form) {
var errors = new Array();
var lscount = 0;
--- conga/luci/cluster/validate_config_multicast.js 2006/10/04 17:24:58 1.3
+++ conga/luci/cluster/validate_config_multicast.js 2007/08/08 21:18:46 1.3.2.1
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
var prev_mcast_str = '';
function disable_mcast(addrId) {
--- conga/luci/cluster/validate_config_qdisk.js 2007/07/12 04:41:39 1.4.2.3
+++ conga/luci/cluster/validate_config_qdisk.js 2007/08/08 21:18:46 1.4.2.4
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
var heuristic_names = [ ':hprog', ':hinterval', ':hscore', ':hdel' ];
function clear_heuristic(form, heur_num) {
--- conga/luci/cluster/validate_create_gulm.js 2007/03/01 00:31:08 1.1.4.1
+++ conga/luci/cluster/validate_create_gulm.js 2007/08/08 21:18:46 1.1.4.2
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
var lockservers = new Array();
function toggle_gulm(form, lock_type) {
--- conga/luci/cluster/validate_fdom.js 2007/03/01 00:31:08 1.3.4.1
+++ conga/luci/cluster/validate_fdom.js 2007/08/08 21:18:46 1.3.4.2
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
function fdom_set_prioritized(form, state) {
var prilist = form.getElementsByTagName('input');
if (!prilist)
--- conga/luci/cluster/validate_fence.js 2007/07/26 04:14:14 1.1.2.5
+++ conga/luci/cluster/validate_fence.js 2007/08/08 21:18:46 1.1.2.6
@@ -1,3 +1,12 @@
+/*
+** Copyright (C) 2006-2007 Red Hat, Inc.
+**
+** This program is free software; you can redistribute
+** it and/or modify it under the terms of version 2 of the
+** GNU General Public License as published by the
+** Free Software Foundation.
+*/
+
var fence_inst_validator = [];
fence_inst_validator['apc'] = [ 'port', 'switch' ];
fence_inst_validator['bladecenter'] = [ 'blade' ];
/cvs/cluster/conga/luci/plone-custom/conga_ajax.js,v --> standard output
revision 1.2.2.1
More information about the Cluster-devel
mailing list