vagrant-kvm 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.1 (April 4, 2013)
+
+* Debian compatibility fix (thanks mfournier).
+
 # 0.1.0 (April 2, 2013)
 
 * Initial release.

data/README.md

@@ -4,8 +4,9 @@ This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds a KVM
 provider to Vagrant, allowing Vagrant to control and provision KVM/QEMU VM.
 
 **NOTE:** This plugin requires Vagrant 1.1+
+
 **NOTE:** This plugin requires QEMU 1.2+, it has only been tested on Fedora 18
-at the moment.
+and Debian Wheezy at the moment.
 
 ## Features/Limitations
 
@@ -14,6 +15,8 @@ at the moment.
 * Uses NFS for sync folders
 * Only works with 1 VM per Vagrantfile for now
 * Only works with private networking for now
+* Requires "libvirt" group membership to run vagrant (Debian/Ubuntu only)
+* Requires backporting qemu and libvirt from experimental (Debian) or raring (Ubuntu)
 
 ## Usage
 
@@ -24,7 +27,7 @@ shown below.
 ```
 $ vagrant plugin install vagrant-kvm
 ...
-$ vagrant up --provider=aws
+$ vagrant up --provider=kvm
 ...
 ```
 

data/lib/vagrant-kvm/util/vm_definition.rb

@@ -95,6 +95,12 @@ module VagrantPlugins
         end
 
         def as_libvirt
+          # RedHat and Debian-based systems have different executable names
+          # depending on version/architectures
+          qemu_bin = [ '/usr/bin/qemu-kvm' ]
+          qemu_bin << '/usr/bin/qemu-system-x86_64' if @arch.match(/64$/)
+          qemu_bin << '/usr/bin/qemu-system-i386'   if @arch.match(/^i.86$/)
+
           xml = KvmTemplateRenderer.render("libvirt_domain", {
             :name => @name,
             :uuid => @uuid,
@@ -103,7 +109,8 @@ module VagrantPlugins
             :arch => @arch,
             :disk => @disk,
             :mac => format_mac(@mac),
-            :network => @network
+            :network => @network,
+            :qemu_bin => qemu_bin.detect { |binary| File.exists? binary }
           })
           xml
         end

data/lib/vagrant-kvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderKvm
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/templates/libvirt_domain.erb

@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
+    <emulator><%= qemu_bin %></emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='<%= disk %>'/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-kvm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri