From 3d21965e7332d99990c904b493b469f1ed47b50a Mon Sep 17 00:00:00 2001 From: Matt Kunkel Date: Wed, 7 Jun 2017 12:43:54 -0500 Subject: [PATCH] Fix HPUX cpu facts on HP Integrity VM's (#25369) Skips cpu facts not returned by machinfo on HP Integrity VM's. Fixes #25368 --- lib/ansible/module_utils/facts/hardware/hpux.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/facts/hardware/hpux.py b/lib/ansible/module_utils/facts/hardware/hpux.py index 24daa1948c..b56302c3dc 100644 --- a/lib/ansible/module_utils/facts/hardware/hpux.py +++ b/lib/ansible/module_utils/facts/hardware/hpux.py @@ -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":