Merge pull request #185 from sciurus/driver_kvm

Default to kvm domain type
This commit is contained in:
Dmitry Vasilets 2014-05-11 09:25:20 +02:00
commit 255da0d2dc
3 changed files with 6 additions and 5 deletions

View File

@ -80,7 +80,7 @@ Vagrant.configure("2") do |config|
end end
config.vm.provider :libvirt do |libvirt| config.vm.provider :libvirt do |libvirt|
libvirt.driver = "qemu" libvirt.driver = "kvm"
libvirt.host = "localhost" libvirt.host = "localhost"
libvirt.connect_via_ssh = true libvirt.connect_via_ssh = true
libvirt.username = "root" libvirt.username = "root"
@ -100,7 +100,7 @@ end
This provider exposes quite a few provider-specific configuration options: This provider exposes quite a few provider-specific configuration options:
* `driver` - A hypervisor name to access. For now only qemu is supported. * `driver` - A hypervisor name to access. For now only kvm and qemu are supported.
* `host` - The name of the server, where libvirtd is running. * `host` - The name of the server, where libvirtd is running.
* `connect_via_ssh` - If use ssh tunnel to connect to Libvirt. * `connect_via_ssh` - If use ssh tunnel to connect to Libvirt.
* `username` - Username and password to access Libvirt. * `username` - Username and password to access Libvirt.

View File

@ -33,10 +33,11 @@ Vagrant.configure("2") do |config|
# A hypervisor name to access. Different drivers can be specified, but # A hypervisor name to access. Different drivers can be specified, but
# this version of provider creates KVM machines only. Some examples of # this version of provider creates KVM machines only. Some examples of
# drivers are qemu (KVM/qemu), xen (Xen hypervisor), lxc (Linux Containers), # drivers are kvm (qemu hardware accelerated), qemu (qemu emulated),
# xen (Xen hypervisor), lxc (Linux Containers),
# esx (VMware ESX), vmwarews (VMware Workstation) and more. Refer to # esx (VMware ESX), vmwarews (VMware Workstation) and more. Refer to
# documentation for available drivers (http://libvirt.org/drivers.html). # documentation for available drivers (http://libvirt.org/drivers.html).
libvirt.driver = "qemu" libvirt.driver = "kvm"
# The name of the server, where libvirtd is running. # The name of the server, where libvirtd is running.
libvirt.host = "localhost" libvirt.host = "localhost"

View File

@ -123,7 +123,7 @@ module VagrantPlugins
end end
def finalize! def finalize!
@driver = 'qemu' if @driver == UNSET_VALUE @driver = 'kvm' if @driver == UNSET_VALUE
@host = nil if @host == UNSET_VALUE @host = nil if @host == UNSET_VALUE
@connect_via_ssh = false if @connect_via_ssh == UNSET_VALUE @connect_via_ssh = false if @connect_via_ssh == UNSET_VALUE
@username = nil if @username == UNSET_VALUE @username = nil if @username == UNSET_VALUE