ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixes for FreeBSD get_memory_facts

Browse source 
- swapinfo on FreeBSD 6 (maybe 7 too?) doesn't support the "-m" flag for
  fetching amounts in megabytes. This patch fetches amounts in kilobytes
  and divides by 1024 (and also returns the result as an int instead of
  a string).

- When no swap is configured, swapinfo prints a header line and nothing
  else:

    $ swapinfo
    Device         1K-blocks     Used    Avail Capacity

  The old version unexpectedly parsed that header line and emitted
  nonsense values like:

    "ansible_swapfree_mb": "Avail"
    "ansible_swaptotal_mb": "1K-blocks"

  This version emits those items altogether.
This commit is contained in:
Kirk Strauser 2015-06-16 14:35:36 -07:00
parent 3b1b95b916
commit 935da01068
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/module_utils/facts.py
View file

@ -1264,13 +1264,14 @@ class FreeBSDHardware(Hardware):
# Device 1M-blocks Used Avail Capacity # Device 1M-blocks Used Avail Capacity
# /dev/ada0p3 314368 0 314368 0% # /dev/ada0p3 314368 0 314368 0%
# #
rc, out, err = module.run_command("/usr/sbin/swapinfo -m") rc, out, err = module.run_command("/usr/sbin/swapinfo -k")
lines = out.split('\n') lines = out.split('\n')
if len(lines[-1]) == 0: if len(lines[-1]) == 0:
lines.pop() lines.pop()
data = lines[-1].split() data = lines[-1].split()
self.facts['swaptotal_mb'] = data[1] if data[0] != 'Device':
self.facts['swapfree_mb'] = data[3] self.facts['swaptotal_mb'] = int(data[1]) / 1024
self.facts['swapfree_mb'] = int(data[3]) / 1024
@timeout(10) @timeout(10)
def get_mount_facts(self): def get_mount_facts(self):