[DRE-commits] [vagrant-libvirt] 70/163: added ability to specify bus for additional disks

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.26
in repository vagrant-libvirt.

commit 6659f4c687259108ac6b5d064489eaff4550ba44
Author: Vil Surkin <vills at webzilla.com>
Date:   Tue Oct 28 21:31:06 2014 +0200

    added ability to specify bus for additional disks
---
 README.md                                    | 1 +
 lib/vagrant-libvirt/config.rb                | 2 ++
 lib/vagrant-libvirt/templates/domain.xml.erb | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83c7fac..5c8966f 100644
--- a/README.md
+++ b/README.md
@@ -281,6 +281,7 @@ You can create and attach additional disks to a VM via `libvirt.storage :file`.
 * `device` - Name of the device node the disk image will have in the VM, e.g. *vdb*. If unspecified, the next available device is chosen.
 * `size` - Size of the disk image. If unspecified, defaults to 10G.
 * `type` - Type of disk image to create. Defaults to *qcow2*.
+* `bus` - Type of bus to connect device to. Defaults to *virtio*.
 
 The following example creates two additional disks.
 
diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb
index 5ccf2de..48995c3 100644
--- a/lib/vagrant-libvirt/config.rb
+++ b/lib/vagrant-libvirt/config.rb
@@ -131,6 +131,7 @@ module VagrantPlugins
           :type => 'qcow2',
           :size => '10G',	# matches the fog default
           :path => nil,
+          :bus => 'virtio'
         }.merge(options)
 
         #puts "storage(#{storage_type} --- #{options.to_s})"
@@ -141,6 +142,7 @@ module VagrantPlugins
           :type => options[:type],
           :size => options[:size],
           :path => options[:path],
+          :bus => options[:bus]
         }
 
         if storage_type == :file
diff --git a/lib/vagrant-libvirt/templates/domain.xml.erb b/lib/vagrant-libvirt/templates/domain.xml.erb
index d5e0486..6c3bda8 100644
--- a/lib/vagrant-libvirt/templates/domain.xml.erb
+++ b/lib/vagrant-libvirt/templates/domain.xml.erb
@@ -38,7 +38,7 @@
     <disk type='file' device='disk'>
       <driver name='qemu' type='<%= d[:type] %>'/>
       <source file='<%= d[:path] %>'/>
-      <target dev='<%= d[:device] %>' bus='virtio'/>
+      <target dev='<%= d[:device] %>' bus='<%= d[:bus] %>'/>
 <%# this will get auto generated by libvirt
       <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
 -%>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git