cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7992 from dehylton/devel

Browse source 
fix swap translation on 4.x openbsd with 2.5.4 python
This commit is contained in:
Michael DeHaan 2014-07-24 09:34:38 -04:00
commit 635bea645c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,8 @@ import getpass
import ConfigParser import ConfigParser
import StringIO import StringIO
from string import maketrans
try: try:
import selinux import selinux
HAVE_SELINUX=True HAVE_SELINUX=True
@ -910,9 +912,10 @@ class OpenBSDHardware(Hardware):
# total: 69268k bytes allocated = 0k used, 69268k available # total: 69268k bytes allocated = 0k used, 69268k available
rc, out, err = module.run_command("/sbin/swapctl -sk") rc, out, err = module.run_command("/sbin/swapctl -sk")
if rc == 0: if rc == 0:
swaptrans = maketrans(' ', ' ')
data = out.split() data = out.split()
self.facts['swapfree_mb'] = long(data[-2].translate(None, "kmg")) / 1024 self.facts['swapfree_mb'] = long(data[-2].translate(swaptrans, "kmg")) / 1024
self.facts['swaptotal_mb'] = long(data[1].translate(None, "kmg")) / 1024 self.facts['swaptotal_mb'] = long(data[1].translate(swaptrans, "kmg")) / 1024
def get_processor_facts(self): def get_processor_facts(self):
processor = [] processor = []