summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-08-06 14:27:48 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2010-08-06 14:27:48 -0700
commite6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b (patch)
tree74f9692816affffedab0d03e9fba44fc75112d2f /nova/compute
parent024ad9951dcf33f5a3468e9a790f1636770b2837 (diff)
parent85b73194c2f8432a7e9ab5d24574746f209846ee (diff)
downloadnova-e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b.tar.gz
nova-e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b.tar.xz
nova-e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b.zip
merged trunk
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/libvirt.xml.template3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template
index a763e8a4d..307f9d03a 100644
--- a/nova/compute/libvirt.xml.template
+++ b/nova/compute/libvirt.xml.template
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='%(type)s'>
<name>%(name)s</name>
<os>
<type>hvm</type>
@@ -12,7 +12,6 @@
<memory>%(memory_kb)s</memory>
<vcpu>%(vcpus)s</vcpu>
<devices>
- <emulator>/usr/bin/kvm</emulator>
<disk type='file'>
<source file='%(basepath)s/disk'/>
<target dev='vda' bus='virtio'/>