diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-30 11:19:03 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-30 11:19:03 -0700 |
| commit | 80b79a923bc6fb331daaf6960e6353c700b89c41 (patch) | |
| tree | 92cb0aa079b565f45be5d230658cd8543b633ef3 | |
| parent | 16e89bad15f5665a5f46c0bdcdfab1b7f3df4039 (diff) | |
| download | nova-80b79a923bc6fb331daaf6960e6353c700b89c41.tar.gz nova-80b79a923bc6fb331daaf6960e6353c700b89c41.tar.xz nova-80b79a923bc6fb331daaf6960e6353c700b89c41.zip | |
use the right tag
| -rw-r--r-- | nova/compute/libvirt.xml.template | 5 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template index a17cd8fae..307f9d03a 100644 --- a/nova/compute/libvirt.xml.template +++ b/nova/compute/libvirt.xml.template @@ -1,7 +1,7 @@ -<domain type='kvm'> +<domain type='%(type)s'> <name>%(name)s</name> <os> - <type>%(type)s</type> + <type>hvm</type> <kernel>%(basepath)s/kernel</kernel> <initrd>%(basepath)s/ramdisk</initrd> <cmdline>root=/dev/vda1 console=ttyS0</cmdline> @@ -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'/> diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index e37444f63..74ab1f895 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -25,7 +25,6 @@ import json import logging import os.path import shutil -import sys from twisted.internet import defer from twisted.internet import task @@ -49,8 +48,8 @@ flags.DEFINE_string('libvirt_xml_template', 'Libvirt XML Template') flags.DEFINE_string('libvirt_type', - 'hvm', - 'Libvirt virtualization type (hvm, qemu, etc)') + 'kvm', + 'Libvirt domain type (kvm, qemu, etc)') def get_connection(read_only): # These are loaded late so that there's no need to install these |