Merge pull request #8227 from trondhindenes/win_setup_improvements

win_setup improvements: Correcly outputs ansible_totalmem
This commit is contained in:
Michael DeHaan 2014-08-08 12:42:41 -04:00
commit 6c42cd09f9

View file

@ -26,7 +26,10 @@ $result = New-Object psobject @{
};
$osversion = [Environment]::OSVersion
$memory = Get-WmiObject win32_Physicalmemory
$memory = @()
$memory += Get-WmiObject win32_Physicalmemory
$capacity = 0
$memory | foreach {$capacity += $_.Capacity}
$netcfg = Get-WmiObject win32_NetworkAdapterConfiguration
Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME;
@ -36,7 +39,7 @@ Set-Attr $result.ansible_facts "ansible_os_family" "Windows"
Set-Attr $result.ansible_facts "ansible_distribution" $osversion.VersionString
Set-Attr $result.ansible_facts "ansible_distribution_version" $osversion.Version.ToString()
Set-Attr $result.ansible_facts "ansible_totalmem" $memory.Capacity.ToString()
Set-Attr $result.ansible_facts "ansible_totalmem" $capacity
$ips = @()
Foreach ($ip in $netcfg.IPAddress) { If ($ip) { $ips += $ip } }