Allow bridges referenced by libvirt networks (#1554)

Permit reference to bridge devices referenced by existing libvirt
networks.

Fixes: #1553
This commit is contained in:
Darragh Bailey
2022-08-22 18:05:04 +01:00
committed by GitHub
parent 591e151b13
commit 1945754f67
4 changed files with 31 additions and 3 deletions

View File

@@ -1213,7 +1213,11 @@ module VagrantPlugins
def host_devices(machine)
@host_devices ||= begin
machine.provider.driver.connection.client.list_all_interfaces().map { |iface| iface.name }.uniq.select do |dev|
(
machine.provider.driver.list_host_devices.map { |iface| iface.name } +
machine.provider.driver.list_networks.map { |net| net.bridge_name }
).uniq.select do |dev|
next if dev.empty?
dev != "lo" && !@host_device_exclude_prefixes.any? { |exclude| dev.start_with?(exclude) }
end
end

View File

@@ -201,6 +201,14 @@ module VagrantPlugins
state
end
def list_host_devices
@connection.client.list_all_interfaces
end
def list_networks
@connection.client.list_all_networks
end
private
def get_ipaddress_from_system(mac)