From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/cluster resource-form-macros resour ...
Date: 22 Jan 2007 17:06:01 -0000 [thread overview]
Message-ID: <20070122170601.9019.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-22 17:06:00
Modified files:
luci/cluster : resource-form-macros resource_form_handlers.js
Log message:
vm resources need special handling. to fix later.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.27&r2=1.28
--- conga/luci/cluster/resource-form-macros 2007/01/20 04:50:19 1.28
+++ conga/luci/cluster/resource-form-macros 2007/01/22 17:05:59 1.29
@@ -149,10 +149,6 @@
<div metal:use-macro="here/resource-form-macros/macros/smb_macro" />
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
- <tal:block tal:condition="python: os_version and os_version == 'rhel5'">
- <div metal:use-macro="here/resource-form-macros/macros/vm_macro" />
- </tal:block>
-
<tal:block tal:condition="python: os_version and os_version == 'rhel4'">
<div metal:use-macro="here/resource-form-macros/macros/apache_macro" />
<div metal:use-macro="here/resource-form-macros/macros/mysql_macro" />
@@ -325,10 +321,6 @@
<div metal:use-macro="here/resource-form-macros/macros/scr_macro" />
</tal:block>
- <tal:block tal:condition="python: type == 'vm'">
- <div metal:use-macro="here/resource-form-macros/macros/vm_macro" />
- </tal:block>
-
<tal:block tal:condition="python: type == 'apache'">
<div metal:use-macro="here/resource-form-macros/macros/apache_macro" />
</tal:block>
@@ -1241,171 +1233,6 @@
</form>
</div>
-<div class="rescfg" name="VM"
- tal:attributes="id res/name | nothing" metal:define-macro="vm_macro">
- <p class="reshdr">Virtual Machine Configuration</p>
-
- <form method="post"
- tal:attributes="name res/parent_uuid | nothing"
- tal:define="editDisabled resourceIsRef | nothing">
-
- <input name="immutable" type="hidden" value="true"
- tal:condition="editDisabled" />
-
- <input name="edit" type="hidden" value="true"
- tal:condition="python: ptype == '33' and True or False" />
-
- <input name="pagetype" type="hidden"
- tal:attributes="value python: ptype" />
-
- <input name="global" type="hidden"
- tal:attributes="value resourceIsRef | nothing" />
-
- <input name="parent_uuid" type="hidden"
- tal:attributes="value res/parent_uuid | nothing" />
-
- <input name="uuid" type="hidden"
- tal:attributes="value res/uuid | nothing" />
-
- <input name="tree_level" type="hidden"
- tal:attributes="value res/indent_ctr | string:0" />
-
- <input name="clustername" type="hidden"
- tal:attributes="
- value request/clustername | request/form/clustername | nothing" />
-
- <input name="oldname" type="hidden"
- tal:attributes="value res/name | nothing" />
-
- <input name="type" type="hidden" value="vm" />
-
- <table class="systemsTable">
- <tr class="systemsTable">
- <td class="systemsTable">Name</td>
- <td class="systemsTable">
- <input type="text" size="20" name="resourceName"
- tal:attributes="
- disabled python: editDisabled;
- value res/name | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Domain</td>
- <td class="systemsTable">
- <input type="text" size="20" name="domain"
- tal:attributes="
- disabled python: editDisabled;
- value res/domain | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Recovery Options</td>
- <td class="systemsTable">
- <select name="recovery"
- tal:attributes="disabled python: editDisabled"
- tal:define="recovery_opt res/recovery | string:relocate">
-
- <option name="relocate" value="relocate"
- tal:content="string:Relocate"
- tal:attributes="
- selected python: recovery_opt == 'relocate' and 'selected' or ''" />
- <option name="restart" value="restart"
- tal:content="string:Restart"
- tal:attributes="
- selected python: recovery_opt == 'restart' and 'selected' or ''" />
- <option name="disable" value="disable"
- tal:content="string:Disable"
- tal:attributes="
- selected python: recovery_opt == 'disable' and 'selected' or ''" />
- </select>
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Memory Size</td>
- <td class="systemsTable">
- <input type="text" size="20" name="memory"
- tal:attributes="
- disabled python: editDisabled;
- value res/memory | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Bootloader</td>
- <td class="systemsTable">
- <input type="text" size="20" name="bootloader"
- tal:attributes="
- disabled python: editDisabled;
- value res/bootloader | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Config File</td>
- <td class="systemsTable">
- <input type="text" size="20" name="path"
- tal:attributes="
- disabled python: editDisabled;
- value res/path | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Root disk for the VM (physical, on the host)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="rootdisk_physical"
- tal:attributes="
- disabled python: editDisabled;
- value res/rootdisk_physical | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Root disk for the VM (as presented to the VM)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="rootdisk_virtual"
- tal:attributes="
- disabled python: editDisabled;
- value res/rootdisk_virtual | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Swap disk for the VM (physical, on the host)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="swapdisk_physical"
- tal:attributes="
- disabled python: editDisabled;
- value res/swapdisk_physical | nothing" />
- </td>
- </tr>
- <tr class="systemsTable">
- <td class="systemsTable">Swap disk for the VM (as presented to the VM)</td>
- <td class="systemsTable">
- <input type="text" size="20" name="swapdisk_virtual"
- tal:attributes="
- disabled python: editDisabled;
- value res/swapdisk_virtual | nothing" />
- </td>
- </tr>
-
- <tr class="systemsTable">
- <td class="systemsTable">Virtual interface MAC address</td>
- <td class="systemsTable">
- <input type="text" size="20" name="vif"
- tal:attributes="
- disabled python: editDisabled;
- value res/vif | nothing" />
- </td>
- </tr>
- </table>
- <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
- </form>
-</div>
-
<div class="rescfg" name="tomcat-5"
tal:attributes="id res/name | nothing" metal:define-macro="tomcat-5_macro">
<p class="reshdr">Tomcat 5 Configuration</p>
--- conga/luci/cluster/resource_form_handlers.js 2007/01/20 04:50:19 1.27
+++ conga/luci/cluster/resource_form_handlers.js 2007/01/22 17:06:00 1.28
@@ -123,11 +123,6 @@
return (errors);
}
-function validate_vm(form) {
- var errors = new Array();
- return (errors);
-}
-
function validate_nfs_export(form) {
var errors = new Array();
return (errors);
@@ -258,7 +253,6 @@
form_validators['gfs'] = validate_gfs;
form_validators['scr'] = validate_script;
form_validators['smb'] = validate_samba;
-form_validators['vm'] = validate_vm;
form_validators['apache'] = validate_apache;
form_validators['tomcat-5'] = validate_tomcat5;
form_validators['postgres-8'] = validate_postgres8;
next reply other threads:[~2007-01-22 17:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-22 17:06 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-03-07 18:04 [Cluster-devel] conga/luci/cluster resource-form-macros resour rmccabe
2007-03-07 18:03 rmccabe
2007-03-07 18:02 rmccabe
2007-01-17 20:50 rmccabe
2006-09-22 19:21 rmccabe
2006-08-10 19:46 shuennek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070122170601.9019.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).