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 #460 from mandre/fix-management-network-address

Browse Source 
Fix undefined method scan issue
This commit is contained in:
Dmitry Vasilets 2015-09-23 17:06:17 +02:00
commit e126180f91
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,7 @@ module VagrantPlugins
@management_network_name = UNSET_VALUE @management_network_name = UNSET_VALUE
@management_network_address = UNSET_VALUE @management_network_address = UNSET_VALUE
@management_network_mode = UNSET_VALUE @management_network_mode = UNSET_VALUE
@management_network_mac = UNSET_VALUE
# Domain specific settings. # Domain specific settings.
@memory = UNSET_VALUE @memory = UNSET_VALUE
@ -113,7 +114,6 @@ module VagrantPlugins
@machine_virtual_size = UNSET_VALUE @machine_virtual_size = UNSET_VALUE
@disk_bus = UNSET_VALUE @disk_bus = UNSET_VALUE
@nic_model_type = UNSET_VALUE @nic_model_type = UNSET_VALUE
@management_network_mac = UNSET_VALUE
@nested = UNSET_VALUE @nested = UNSET_VALUE
@volume_cache = UNSET_VALUE @volume_cache = UNSET_VALUE
@kernel = UNSET_VALUE @kernel = UNSET_VALUE
@ -311,6 +311,7 @@ module VagrantPlugins
@management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE @management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE
@management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE @management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
@management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
@management_network_mac = nil if @management_network_mac == UNSET_VALUE
# generate a URI if none is supplied # generate a URI if none is supplied
@uri = _generate_uri() if @uri == UNSET_VALUE @uri = _generate_uri() if @uri == UNSET_VALUE