NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #389 from electrofelix/identify-disk-by-pool

Browse Source 
Use storage pool to identify correct volume
This commit is contained in:
Dmitry Vasilets 2015-06-09 22:20:04 +02:00
commit 529588ff50
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vagrant-libvirt/action/create_domain.rb
View File

@ -68,9 +68,10 @@ module VagrantPlugins
@os_type = 'hvm' @os_type = 'hvm'
# Get path to domain image. # Get path to domain image from the storage pool selected.
domain_volume = ProviderLibvirt::Util::Collection.find_matching( domain_volume = ProviderLibvirt::Util::Collection.find_matching(
env[:libvirt_compute].volumes.all, "#{@name}.img") env[:libvirt_compute].volumes.all.select { |x| x.pool_name == @storage_pool_name },
"#{@name}.img")
raise Errors::DomainVolumeExists if domain_volume.nil? raise Errors::DomainVolumeExists if domain_volume.nil?
@domain_volume_path = domain_volume.path @domain_volume_path = domain_volume.path
@ -88,7 +89,8 @@ module VagrantPlugins
disk[:absolute_path] = storage_prefix + disk[:path] disk[:absolute_path] = storage_prefix + disk[:path]
if env[:libvirt_compute].volumes.all.select {|x| x.name == disk[:name] }.empty? if env[:libvirt_compute].volumes.select {
|x| x.name == disk[:name] and x.pool_name == @storage_pool_name}.empty?
# make the disk. equivalent to: # make the disk. equivalent to:
# qemu-img create -f qcow2 <path> 5g # qemu-img create -f qcow2 <path> 5g
begin begin