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

Remove one branch that can never be taken and comment another that can only be taken in older vagrant

Browse Source
This commit is contained in:
Brian Pitts
2014-01-12 14:32:09 -06:00
parent c4d758b4e7
commit 01d3f28d0d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vagrant-libvirt/action/create_networks.rb
View File

@@ -67,17 +67,12 @@ module VagrantPlugins
if @options[:ip] if @options[:ip]
@logger.debug "handle by ip" @logger.debug "handle by ip"
handle_ip_option(env) handle_ip_option(env)
# in vagrant 1.2.3 and later it is not possible to take this branch
# bcasue cannot have name without ip
# https://github.com/mitchellh/vagrant/commit/cf2f6da4dbcb4f57c9cdb3b94dcd0bba62c5f5fd
elsif @options[:network_name] elsif @options[:network_name]
@logger.debug "handle by name" @logger.debug "handle by name"
handle_network_name_option handle_network_name_option
else
@logger.debug "neither ip nor name specified so finding default"
# TODO: Should be smarter than just using fixed 'default' string.
@interface_network = lookup_network_by_name('default')
if !@interface_network
raise Errors::NetworkNotAvailableError,
network_name: 'default'
end
end end
autostart_network if !@interface_network[:autostart] autostart_network if !@interface_network[:autostart]