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

Merge branch 'tgolly-devel' into devel

Browse source
This commit is contained in:
James Cammarata 2014-06-19 22:42:25 -05:00
commit 8b15788a40
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1296,9 +1296,18 @@ class HPUX(Hardware):
data = int(re.sub(' +',' ',out).split(' ')[5].strip()) data = int(re.sub(' +',' ',out).split(' ')[5].strip())
self.facts['memfree_mb'] = pagesize * data / 1024 / 1024 self.facts['memfree_mb'] = pagesize * data / 1024 / 1024
if self.facts['architecture'] == '9000/800': if self.facts['architecture'] == '9000/800':
rc, out, err = module.run_command("grep Physical /var/adm/syslog/syslog.log") try:
data = re.search('.*Physical: ([0-9]*) Kbytes.*',out).groups()[0].strip() rc, out, err = module.run_command("grep Physical /var/adm/syslog/syslog.log")
self.facts['memtotal_mb'] = int(data) / 1024 data = re.search('.*Physical: ([0-9]*) Kbytes.*',out).groups()[0].strip()
self.facts['memtotal_mb'] = int(data) / 1024
except AttributeError:
#For systems where memory details aren't sent to syslog or the log has rotated, use parsed
#adb output. Unfortunatley /dev/kmem doesn't have world-read, so this only works as root.
if os.access("/dev/kmem", os.R_OK):
rc, out, err = module.run_command("echo 'phys_mem_pages/D' | adb -k /stand/vmunix /dev/kmem | tail -1 | awk '{print $2}'", use_unsafe_shell=True)
if not err:
data = out
self.facts['memtotal_mb'] = int(data) / 256
else: else:
rc, out, err = module.run_command("/usr/contrib/bin/machinfo | grep Memory", use_unsafe_shell=True) rc, out, err = module.run_command("/usr/contrib/bin/machinfo | grep Memory", use_unsafe_shell=True)
data = re.search('Memory[\ :=]*([0-9]*).*MB.*',out).groups()[0].strip() data = re.search('Memory[\ :=]*([0-9]*).*MB.*',out).groups()[0].strip()

4
library/system/cron
View file

@ -354,6 +354,8 @@ class CronTab(object):
return "su %s -c '%s -l'" % (pipes.quote(self.user), pipes.quote(CRONCMD)) return "su %s -c '%s -l'" % (pipes.quote(self.user), pipes.quote(CRONCMD))
elif platform.system() == 'AIX': elif platform.system() == 'AIX':
return "%s -l %s" % (pipes.quote(CRONCMD), pipes.quote(self.user)) return "%s -l %s" % (pipes.quote(CRONCMD), pipes.quote(self.user))
elif platform.system() == 'HP-UX':
return "%s %s %s" % (CRONCMD , '-l', pipes.quote(self.user))
else: else:
user = '-u %s' % pipes.quote(self.user) user = '-u %s' % pipes.quote(self.user)
return "%s %s %s" % (CRONCMD , user, '-l') return "%s %s %s" % (CRONCMD , user, '-l')
@ -364,7 +366,7 @@ class CronTab(object):
""" """
user = '' user = ''
if self.user: if self.user:
if platform.system() in [ 'SunOS', 'AIX' ]: if platform.system() in ['SunOS', 'HP-UX', 'AIX']:
return "chown %s %s ; su '%s' -c '%s %s'" % (pipes.quote(self.user), pipes.quote(path), pipes.quote(self.user), CRONCMD, pipes.quote(path)) return "chown %s %s ; su '%s' -c '%s %s'" % (pipes.quote(self.user), pipes.quote(path), pipes.quote(self.user), CRONCMD, pipes.quote(path))
else: else:
user = '-u %s' % pipes.quote(self.user) user = '-u %s' % pipes.quote(self.user)