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

Merge pull request #408 from dcbw/dcbw/pass-mac-to-vagrant

Browse Source 
Read MAC address from libvirt and pass up to Vagrant
This commit is contained in:
Dmitry Vasilets 2015-07-01 00:38:22 +02:00
commit ab34b7d29b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/vagrant-libvirt/action/create_network_interfaces.rb
View File

@ -96,6 +96,21 @@ module VagrantPlugins
raise Errors::AttachDeviceError, raise Errors::AttachDeviceError,
:error_message => e.message :error_message => e.message
end end
# Re-read the network configuration and grab the MAC address
if !@mac
xml = Nokogiri::XML(domain.xml_desc)
if iface_configuration[:iface_type] == :public_network
if @type == 'direct'
@mac = xml.xpath("/domain/devices/interface[source[@dev='#{@device}']]/mac/@address")
else
@mac = xml.xpath("/domain/devices/interface[source[@bridge='#{@device}']]/mac/@address")
end
else
@mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address")
end
iface_configuration[:mac] = @mac.to_s
end
end end
# Continue the middleware chain. # Continue the middleware chain.
@ -116,7 +131,7 @@ module VagrantPlugins
network = { network = {
:interface => slot_number, :interface => slot_number,
:use_dhcp_assigned_default_route => options[:use_dhcp_assigned_default_route], :use_dhcp_assigned_default_route => options[:use_dhcp_assigned_default_route],
#:mac => ..., :mac_address => options[:mac],
} }
if options[:ip] if options[:ip]