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

Fix HPUX cpu facts on HP Integrity VM's (#25369)

Browse source 
Skips cpu facts not returned by machinfo on HP Integrity VM's.

Fixes #25368
This commit is contained in:
Matt Kunkel 2017-06-07 12:43:54 -05:00 • committed by Adrian Likins
parent eda6a6baee
commit 3d21965e73
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/facts/hardware/hpux.py
View file

@ -62,9 +62,11 @@ class HPUXHardware(Hardware):
elif collected_facts.get('ansible_architecture') == 'ia64':
if collected_facts.get('ansible_distribution_version') == "B.11.23":
rc, out, err = self.module.run_command("/usr/contrib/bin/machinfo | grep 'Number of CPUs'", use_unsafe_shell=True)
cpu_facts['processor_count'] = int(out.strip().split('=')[1])
if out:
cpu_facts['processor_count'] = int(out.strip().split('=')[1])
rc, out, err = self.module.run_command("/usr/contrib/bin/machinfo | grep 'processor family'", use_unsafe_shell=True)
cpu_facts['processor'] = re.search('.*(Intel.*)', out).groups()[0].strip()
if out:
cpu_facts['processor'] = re.search('.*(Intel.*)', out).groups()[0].strip()
rc, out, err = self.module.run_command("ioscan -FkCprocessor | wc -l", use_unsafe_shell=True)
cpu_facts['processor_cores'] = int(out.strip())
if collected_facts.get('ansible_distribution_version') == "B.11.31":