Merge pull request #9855 from WIgor/master

Fix for ubuntu 17.10+ netplan
This commit is contained in:
Chris Roberts 2018-06-08 16:03:07 -07:00 committed by GitHub
commit 9001dc6b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -37,7 +37,9 @@ module VagrantPlugins
ethernets = {}.tap do |e_nets|
networks.each do |network|
e_config = {}.tap do |entry|
if network[:ip]
if network[:type].to_s == "dhcp"
entry["dhcp4"] = true
else
mask = network[:netmask]
if mask && IPAddr.new(network[:ip]).ipv4?
begin
@ -47,8 +49,6 @@ module VagrantPlugins
end
end
entry["addresses"] = [[network[:ip], mask].compact.join("/")]
else
entry["dhcp4"] = true
end
if network[:gateway]
entry["gateway4"] = network[:gateway]