Permalink
Browse files

cobbler/item_system.py:

- added openvz for virt_type
  • Loading branch information...
1 parent 8b3a7cd commit 071c99fe05b7fec9991a177a64ae7000b05ba58c @neverho0d neverho0d committed with jimi-c May 30, 2012
Showing with 20 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +1 −1 cobbler/item_system.py
  3. +18 −0 tests/apitests.conf
View
@@ -13,6 +13,7 @@ TAGS
.project
.pydevproject
.coverage
+.metadata
# docs - ignore pod output
docs/*.gz
View
@@ -46,7 +46,7 @@
["depth",2,0,"",False,"",0,"int"],
["server","<<inherit>>",0,"Server Override",True,"See manpage or leave blank",0,"str"],
["virt_path","<<inherit>>",0,"Virt Path",True,"Ex: /directory or VolGroup00",0,"str"],
- ["virt_type","<<inherit>>",0,"Virt Type",True,"Virtualization technology to use",["xenpv","xenfv","qemu","kvm","vmware"],"str"],
+ ["virt_type","<<inherit>>",0,"Virt Type",True,"Virtualization technology to use",["xenpv","xenfv","qemu","kvm","vmware", "openvz"],"str"],
["virt_cpus","<<inherit>>",0,"Virt CPUs",True,"",0,"int"],
["virt_file_size","<<inherit>>",0,"Virt File Size(GB)",True,"",0,"float"],
["virt_disk_driver","<<inherit>>",0,"Virt Disk Driver Type",True,"The on-disk format for the virtualization disk","raw","str"],
View
@@ -0,0 +1,18 @@
+# Cobbler test suite settings
+
+# Cobbler server to test against:
+cobbler_server: 127.0.0.1
+cobbler_user: testing
+cobbler_pass: testing
+
+# Test files, these must exist on the Cobbler server's filesystem:
+
+# These do not have to be real kernel/initrd, just empty files will do:
+test_kernel: /tmp/cobblertest/fake-kernel
+test_initrd: /tmp/cobblertest/fake-initrd
+
+# Should exist by default on most Cobbler servers:
+test_kickstart: /var/lib/cobbler/kickstarts/sample.ks
+
+# These should be a valid cheetah template:
+test_template: /tmp/cobblertest/fake-template

0 comments on commit 071c99f

Please sign in to comment.