Fix for ubuntu 17.10+ netplan
https://github.com/hashicorp/vagrant/issues/9570
This commit is contained in:
parent
dfb2a9e823
commit
be096c3ef4
|
@ -37,7 +37,9 @@ module VagrantPlugins
|
||||||
ethernets = {}.tap do |e_nets|
|
ethernets = {}.tap do |e_nets|
|
||||||
networks.each do |network|
|
networks.each do |network|
|
||||||
e_config = {}.tap do |entry|
|
e_config = {}.tap do |entry|
|
||||||
if network[:ip]
|
if network[:type] == :dhcp
|
||||||
|
entry["dhcp4"] = true
|
||||||
|
else
|
||||||
mask = network[:netmask]
|
mask = network[:netmask]
|
||||||
if mask && IPAddr.new(network[:ip]).ipv4?
|
if mask && IPAddr.new(network[:ip]).ipv4?
|
||||||
begin
|
begin
|
||||||
|
@ -47,8 +49,6 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
entry["addresses"] = [[network[:ip], mask].compact.join("/")]
|
entry["addresses"] = [[network[:ip], mask].compact.join("/")]
|
||||||
else
|
|
||||||
entry["dhcp4"] = true
|
|
||||||
end
|
end
|
||||||
if network[:gateway]
|
if network[:gateway]
|
||||||
entry["gateway4"] = network[:gateway]
|
entry["gateway4"] = network[:gateway]
|
||||||
|
|
Loading…
Reference in New Issue