haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8831 from chrisroberts/hyperv/ipv6 

Update guest IP address discovery for hyper-v guests.
This commit is contained in:
Chris Roberts 2017-08-21 13:15:06 -07:00 committed by GitHub
parent d014cdac65 38fed54697
commit 18d3e5d286
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/providers/hyperv/action/wait_for_ip_address.rb
View File

@ -23,19 +23,23 @@ module VagrantPlugins
return if env[:interrupted] return if env[:interrupted]
# Try to get the IP # Try to get the IP
network_info = env[:machine].provider.driver.read_guest_ip begin
guest_ip = network_info["ip"] network_info = env[:machine].provider.driver.read_guest_ip
guest_ip = network_info["ip"]
if guest_ip if guest_ip
begin begin
IPAddr.new(guest_ip) IPAddr.new(guest_ip)
break break
rescue IPAddr::InvalidAddressError rescue IPAddr::InvalidAddressError
# Ignore, continue looking. # Ignore, continue looking.
@logger.warn("Invalid IP address returned: #{guest_ip}") @logger.warn("Invalid IP address returned: #{guest_ip}")
end
end end
rescue Errors::PowerShellError
# Ignore, continue looking.
@logger.warn("Failed to read guest IP.")
end end
sleep 1 sleep 1
end end
end end

33
plugins/providers/hyperv/scripts/get_network_config.ps1
View File

@ -7,21 +7,36 @@ Param(
$Dir = Split-Path $script:MyInvocation.MyCommand.Path $Dir = Split-Path $script:MyInvocation.MyCommand.Path
. ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1")) . ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1"))
$ip_address = ""
$vm = Get-VM -Id $VmId -ErrorAction "Stop" $vm = Get-VM -Id $VmId -ErrorAction "Stop"
$networks = Get-VMNetworkAdapter -VM $vm $networks = Get-VMNetworkAdapter -VM $vm
foreach ($network in $networks) { foreach ($network in $networks) {
if ($network.IpAddresses.Length -gt 0) { if ($network.IpAddresses.Length -gt 0) {
$ip_address = $network.IpAddresses[0] foreach ($ip_address in $network.IpAddresses) {
if (-Not ([string]::IsNullOrEmpty($ip_address))) { if ($ip_address.Contains(".")) {
# We found our IP address! $ip4_address = $ip_address
break } elseif ($ip_address.Contains(":")) {
$ip6_address = $ip_address
}
if (-Not ([string]::IsNullOrEmpty($ip4_address)) -Or -Not ([string]::IsNullOrEmpty($ip6_address))) {
# We found our IP address!
break
}
} }
} }
} }
$resultHash = @{ if (-Not ([string]::IsNullOrEmpty($ip4_address))) {
ip = "$ip_address" $guest_ipaddress = $ip4_address
} elseif (-Not ([string]::IsNullOrEmpty($ip6_address))) {
$guest_ipaddress = $ip6_address
}
if (-Not ([string]::IsNullOrEmpty($guest_ipaddress))) {
$resultHash = @{
ip = $guest_ipaddress
}
$result = ConvertTo-Json $resultHash
Write-Output-Message $result
} else {
Write-Error-Message "Failed to determine IP address"
} }
$result = ConvertTo-Json $resultHash
Write-Output-Message $result