Fix for :public_network and :private_network in the same VM (#872)

* Clean properties between use. Fixes #842

* Remove empty log line
This commit is contained in:
Michael Shulbaev
2018-03-19 19:08:51 +07:00
committed by Dmitry Vasilets
parent 60e93d4925
commit 92dc692b08
2 changed files with 2 additions and 1 deletions

View File

@@ -186,7 +186,6 @@ module VagrantPlugins
if not @cpu_topology.empty?
env[:ui].info(" -- CPU topology: sockets=#{@cpu_topology[:sockets]}, cores=#{@cpu_topology[:cores]}, threads=#{@cpu_topology[:threads]}")
end
env[:ui].info("")
@cpu_features.each do |cpu_feature|
env[:ui].info(" -- CPU Feature: name=#{cpu_feature[:name]}, policy=#{cpu_feature[:policy]}")
end

View File

@@ -80,6 +80,8 @@ module VagrantPlugins
@pci_bus = iface_configuration.fetch(:bus, nil)
@pci_slot = iface_configuration.fetch(:slot, nil)
template_name = 'interface'
@type = nil
@udp_tunnel = nil
# Configuration for public interfaces which use the macvtap driver
if iface_configuration[:iface_type] == :public_network
@device = iface_configuration.fetch(:dev, 'eth0')