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

Merge pull request #8171 from jbenden/osx-10.10

Browse source 
Support for OS X 10.10 DP3.
This commit is contained in:
Michael DeHaan 2014-07-28 11:08:53 -04:00
commit 30e6a659ae
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1381,7 +1381,9 @@ class Darwin(Hardware):
return system_profile return system_profile
def get_mac_facts(self): def get_mac_facts(self):
self.facts['model'] = self.sysctl['hw.model'] rc, out, err = module.run_command("sysctl hw.model")
if rc == 0:
self.facts['model'] = out.splitlines()[-1].split()[1]
self.facts['osversion'] = self.sysctl['kern.osversion'] self.facts['osversion'] = self.sysctl['kern.osversion']
self.facts['osrevision'] = self.sysctl['kern.osrevision'] self.facts['osrevision'] = self.sysctl['kern.osrevision']
@ -1396,7 +1398,10 @@ class Darwin(Hardware):
def get_memory_facts(self): def get_memory_facts(self):
self.facts['memtotal_mb'] = long(self.sysctl['hw.memsize']) / 1024 / 1024 self.facts['memtotal_mb'] = long(self.sysctl['hw.memsize']) / 1024 / 1024
self.facts['memfree_mb'] = long(self.sysctl['hw.usermem']) / 1024 / 1024
rc, out, err = module.run_command("sysctl hw.usermem")
if rc == 0:
self.facts['memfree_mb'] = long(out.splitlines()[-1].split()[1]) / 1024 / 1024
class Network(Facts): class Network(Facts):
""" """