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 #974 from electrofelix/match-storage-pool-by-default

Browse Source 
Default to storage pool if snapshot pool not defined
This commit is contained in:
Darragh Bailey 2020-03-27 18:34:33 +00:00 committed by GitHub
commit 4598cfc280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ module VagrantPlugins
# Get path to domain image from the storage pool selected if we have a box. # Get path to domain image from the storage pool selected if we have a box.
if env[:machine].config.vm.box if env[:machine].config.vm.box
if @snapshot_pool_name != 'default' if @snapshot_pool_name != @storage_pool_name
pool_name = @snapshot_pool_name pool_name = @snapshot_pool_name
else else
pool_name = @storage_pool_name pool_name = @storage_pool_name

2
lib/vagrant-libvirt/action/create_domain_volume.rb
View File

@ -71,7 +71,7 @@ module VagrantPlugins
Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS | Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS |
Nokogiri::XML::Node::SaveOptions::FORMAT Nokogiri::XML::Node::SaveOptions::FORMAT
) )
if config.snapshot_pool_name != 'default' if config.snapshot_pool_name != config.storage_pool_name
pool_name = config.snapshot_pool_name pool_name = config.snapshot_pool_name
else else
pool_name = config.storage_pool_name pool_name = config.storage_pool_name

2
lib/vagrant-libvirt/config.rb
View File

@ -644,7 +644,7 @@ module VagrantPlugins
@password = nil if @password == UNSET_VALUE @password = nil if @password == UNSET_VALUE
@id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE @id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE
@storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE @storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
@snapshot_pool_name = 'default' if @snapshot_pool_name == UNSET_VALUE @snapshot_pool_name = @storage_pool_name if @snapshot_pool_name == UNSET_VALUE
@storage_pool_path = nil if @storage_pool_path == UNSET_VALUE @storage_pool_path = nil if @storage_pool_path == UNSET_VALUE
@random_hostname = false if @random_hostname == UNSET_VALUE @random_hostname = false if @random_hostname == UNSET_VALUE
@management_network_device = 'virbr0' if @management_network_device == UNSET_VALUE @management_network_device = 'virbr0' if @management_network_device == UNSET_VALUE