summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler/utils.py2
-rw-r--r--webui_templates/profile_edit.tmpl15
3 files changed, 17 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 33032947..d8afff5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ Cobbler CHANGELOG
- bootloaders is no longer a config file setting
- we can now look for syslinux in one of two places (/usr/lib, /usr/share)
- cobbler hardlinks a bit more when it can for /var/www image copies
+- add Xen FV and VMware virt types to WebUI
- Wed Jun 03 2008 - 1.0.3
- Fix typo in replicate code
diff --git a/cobbler/utils.py b/cobbler/utils.py
index 83a71adb..5acc682f 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -902,7 +902,7 @@ def set_virt_type(self,vtype):
self.virt_type == "<<inherit>>"
return True
- if vtype.lower() not in [ "qemu", "xenpv", "xenfv", "vmware", "auto" ]:
+ if vtype.lower() not in [ "qemu", "xenpv", "xenfv", "vmware", "vmwarew", "auto" ]:
raise CX(_("invalid virt type"))
self.virt_type = vtype
return True
diff --git a/webui_templates/profile_edit.tmpl b/webui_templates/profile_edit.tmpl
index 0c8f1563..d9d6f030 100644
--- a/webui_templates/profile_edit.tmpl
+++ b/webui_templates/profile_edit.tmpl
@@ -216,11 +216,26 @@ function disablename(value)
#else
<input type="radio" name="virttype" id="virttype" value="xenpv">Xen (pv)
#end if
+ #if $profile and $profile.virt_type == "xenfv"
+ <input type="radio" name="virttype" id="virttype" value="xenfv" checked>Xen (fv)
+ #else
+ <input type="radio" name="virttype" id="virttype" value="xenfv">Xen (fv)
+ #end if
#if $profile and $profile.virt_type == "qemu"
<input type="radio" name="virttype" id="virttype" value="qemu" checked>qemu/KVM
#else
<input type="radio" name="virttype" id="virttype" value="qemu">qemu/KVM
#end if
+ #if $profile and $profile.virt_type == "vmware"
+ <input type="radio" name="virttype" id="virttype" value="vmware" checked>VMW Server
+ #else
+ <input type="radio" name="virttype" id="virttype" value="vmware">VMW Server
+ #end if
+ #if $profile and $profile.virt_type == "vmwarew"
+ <input type="radio" name="virttype" id="virttype" value="vmwarew" checked>VMW WkStn
+ #else
+ <input type="radio" name="virttype" id="virttype" value="vmwarew">VMW WkStn
+ #end if
<p class="context-tip">What virtualization technology should koan use?</p>
</td>
</tr>