win_setup improvements: Correcly outputs ansible_totalmem on computers with multiple ram chips

This commit is contained in:
Trond Hindenes 2014-07-22 01:38:46 +02:00
parent 0a33ac418a
commit fc26601981

View file

@ -26,7 +26,10 @@ $result = New-Object psobject @{
}; };
$osversion = [Environment]::OSVersion $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 $netcfg = Get-WmiObject win32_NetworkAdapterConfiguration
Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME; 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" $osversion.VersionString
Set-Attr $result.ansible_facts "ansible_distribution_version" $osversion.Version.ToString() 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 = @() $ips = @()
Foreach ($ip in $netcfg.IPAddress) { If ($ip) { $ips += $ip } } Foreach ($ip in $netcfg.IPAddress) { If ($ip) { $ips += $ip } }