a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "replace math round with ceiling for ansible_memtotal_mb + add new variables to display swapfile config (#49611)" (#49876) 

This reverts commit b3ac5b637a.
pull/4420/head
Jordan Borean 2018-12-13 21:33:55 +10:00 committed by GitHub
parent af5d84b70b
commit 2adb9f32ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/modules/windows/setup.ps1
View File

@ -296,17 +296,14 @@ if ($gather_subset.Contains("local") -and $factpath -ne $null) {
if($gather_subset.Contains('memory')) { if($gather_subset.Contains('memory')) {
$win32_cs = Get-LazyCimInstance Win32_ComputerSystem $win32_cs = Get-LazyCimInstance Win32_ComputerSystem
$win32_os = Get-LazyCimInstance Win32_OperatingSystem $win32_os = Get-LazyCimInstance Win32_OperatingSystem
$win32_pf = Get-LazyCimInstance Win32_PageFileSetting
$ansible_facts += @{ $ansible_facts += @{
# Win32_PhysicalMemory is empty on some virtual platforms # Win32_PhysicalMemory is empty on some virtual platforms
ansible_memtotal_mb = ([math]::ceiling($win32_cs.TotalPhysicalMemory / 1024 / 1024)) ansible_memtotal_mb = ([math]::round($win32_cs.TotalPhysicalMemory / 1024 / 1024))
ansible_swaptotal_mb = ([math]::round($win32_os.TotalSwapSpaceSize / 1024)) ansible_swaptotal_mb = ([math]::round($win32_os.TotalSwapSpaceSize / 1024 / 1024))
ansible_memtotal = $win32_cs.TotalPhysicalMemory
ansible_swap_min = $win32_pf.InitialSize * 1024 * 1024
ansible_swap_max = $win32_pf.MaximumSize * 1024 * 1024
} }
} }
if($gather_subset.Contains('platform')) { if($gather_subset.Contains('platform')) {
$win32_cs = Get-LazyCimInstance Win32_ComputerSystem $win32_cs = Get-LazyCimInstance Win32_ComputerSystem
$win32_os = Get-LazyCimInstance Win32_OperatingSystem $win32_os = Get-LazyCimInstance Win32_OperatingSystem