wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[stable-2.7] fix memtotal_mb rounding on VMWare and swaptotal_mb conversion from KB to MB (#50055)

Browse source 
* fix facts memtotal_mb rounding on VMWare and swaptotal_mb conversion from KB to MB

(cherry picked from commit cc3e43cb2051d210ebb7dfbea2cd3674b1ecf616)

* add changelog fragment
This commit is contained in:
Gregory Storme 2019-01-07 19:10:46 +01:00 committed by Toshio Kuratomi
parent aa10266d55
commit 44087c7554
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/windows_setup_memtotal.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- setup - fix the rounding of the ansible_memtotal_mb value on VMWare vm's (https://github.com/ansible/ansible/issues/49608)

4
lib/ansible/modules/windows/setup.ps1
View file

@ -298,8 +298,8 @@ if($gather_subset.Contains('memory')) {
$win32_os = Get-LazyCimInstance Win32_OperatingSystem
$ansible_facts += @{
# Win32_PhysicalMemory is empty on some virtual platforms
ansible_memtotal_mb = ([math]::round($win32_cs.TotalPhysicalMemory / 1024 / 1024))
ansible_swaptotal_mb = ([math]::round($win32_os.TotalSwapSpaceSize / 1024 / 1024))
ansible_memtotal_mb = ([math]::ceiling($win32_cs.TotalPhysicalMemory / 1024 / 1024))
ansible_swaptotal_mb = ([math]::round($win32_os.TotalSwapSpaceSize / 1024))
}
}