ansible-core 2.17.6__py3-none-any.whl → 2.18.0__py3-none-any.whl

ansible/module_utils/facts/hardware/freebsd.py

@@ -23,7 +23,6 @@ import time
 
 from ansible.module_utils.facts.hardware.base import Hardware, HardwareCollector
 from ansible.module_utils.facts.timeout import TimeoutError, timeout
-
 from ansible.module_utils.facts.utils import get_file_content, get_mount_size
 
 
@@ -173,13 +172,50 @@ class FreeBSDHardware(Hardware):
 
         sysdir = '/dev'
         device_facts['devices'] = {}
-        drives = re.compile(r'(ada?\d+|da\d+|a?cd\d+)')  # TODO: rc, disks, err = self.module.run_command("/sbin/sysctl kern.disks")
-        slices = re.compile(r'(ada?\d+s\d+\w*|da\d+s\d+\w*)')
+        # TODO: rc, disks, err = self.module.run_command("/sbin/sysctl kern.disks")
+        drives = re.compile(
+            r"""(?x)(
+              (?:
+                ada?   # ATA/SATA disk device
+                |da    # SCSI disk device
+                |a?cd  # SCSI CDROM drive
+                |amrd  # AMI MegaRAID drive
+                |idad  # Compaq RAID array
+                |ipsd  # IBM ServeRAID RAID array
+                |md    # md(4) disk device
+                |mfid  # LSI MegaRAID SAS array
+                |mlxd  # Mylex RAID disk
+                |twed  # 3ware ATA RAID array
+                |vtbd  # VirtIO Block Device
+              )\d+
+            )
+            """
+        )
+
+        slices = re.compile(
+            r"""(?x)(
+              (?:
+                ada?   # ATA/SATA disk device
+                |a?cd  # SCSI CDROM drive
+                |amrd  # AMI MegaRAID drive
+                |da    # SCSI disk device
+                |idad  # Compaq RAID array
+                |ipsd  # IBM ServeRAID RAID array
+                |md    # md(4) disk device
+                |mfid  # LSI MegaRAID SAS array
+                |mlxd  # Mylex RAID disk
+                |twed  # 3ware ATA RAID array
+                |vtbd  # VirtIO Block Device
+              )\d+[ps]\d+\w*
+            )
+            """
+        )
+
         if os.path.isdir(sysdir):
             dirlist = sorted(os.listdir(sysdir))
             for device in dirlist:
                 d = drives.match(device)
-                if d:
+                if d and d.group(1) not in device_facts['devices']:
                     device_facts['devices'][d.group(1)] = []
                 s = slices.match(device)
                 if s:
@@ -216,18 +252,22 @@ class FreeBSDHardware(Hardware):
             'product_version': 'system-version',
             'system_vendor': 'system-manufacturer',
         }
+        if dmi_bin is None:
+            dmi_facts = dict.fromkeys(
+                DMI_DICT.keys(),
+                'NA'
+            )
+            return dmi_facts
+
         for (k, v) in DMI_DICT.items():
-            if dmi_bin is not None:
-                (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
-                if rc == 0:
-                    # Strip out commented lines (specific dmidecode output)
-                    # FIXME: why add the fact and then test if it is json?
-                    dmi_facts[k] = ''.join([line for line in out.splitlines() if not line.startswith('#')])
-                    try:
-                        json.dumps(dmi_facts[k])
-                    except UnicodeDecodeError:
-                        dmi_facts[k] = 'NA'
-                else:
+            (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
+            if rc == 0:
+                # Strip out commented lines (specific dmidecode output)
+                # FIXME: why add the fact and then test if it is json?
+                dmi_facts[k] = ''.join([line for line in out.splitlines() if not line.startswith('#')])
+                try:
+                    json.dumps(dmi_facts[k])
+                except UnicodeDecodeError:
                     dmi_facts[k] = 'NA'
             else:
                 dmi_facts[k] = 'NA'

ansible/module_utils/facts/hardware/hpux.py

@@ -40,6 +40,9 @@ class HPUXHardware(Hardware):
     def populate(self, collected_facts=None):
         hardware_facts = {}
 
+        # TODO: very inefficient calls to machinfo,
+        # should just make one and then deal with finding the data (see facts/sysctl)
+        # but not going to change unless there is hp/ux for testing
         cpu_facts = self.get_cpu_facts(collected_facts=collected_facts)
         memory_facts = self.get_memory_facts()
         hw_facts = self.get_hw_facts()

ansible/module_utils/facts/hardware/linux.py

@@ -24,12 +24,9 @@ import re
 import sys
 import time
 
-from multiprocessing import cpu_count
-from multiprocessing.pool import ThreadPool
-
-from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils._internal._concurrent import _futures
 from ansible.module_utils.common.locale import get_best_parsable_locale
-from ansible.module_utils.common.process import get_bin_path
+from ansible.module_utils.common.text.converters import to_text
 from ansible.module_utils.common.text.formatters import bytes_to_human
 from ansible.module_utils.facts.hardware.base import Hardware, HardwareCollector
 from ansible.module_utils.facts.utils import get_file_content, get_file_lines, get_mount_size
@@ -91,6 +88,7 @@ class LinuxHardware(Hardware):
         cpu_facts = self.get_cpu_facts(collected_facts=collected_facts)
         memory_facts = self.get_memory_facts()
         dmi_facts = self.get_dmi_facts()
+        sysinfo_facts = self.get_sysinfo_facts()
         device_facts = self.get_device_facts()
         uptime_facts = self.get_uptime_facts()
         lvm_facts = self.get_lvm_facts()
@@ -104,6 +102,7 @@ class LinuxHardware(Hardware):
         hardware_facts.update(cpu_facts)
         hardware_facts.update(memory_facts)
         hardware_facts.update(dmi_facts)
+        hardware_facts.update(sysinfo_facts)
         hardware_facts.update(device_facts)
         hardware_facts.update(uptime_facts)
         hardware_facts.update(lvm_facts)
@@ -208,6 +207,9 @@ class LinuxHardware(Hardware):
                     if 'vme' not in val:
                         xen_paravirt = True
 
+            if key == "flags":
+                cpu_facts['flags'] = val.split()
+
             # model name is for Intel arch, Processor (mind the uppercase P)
             # works for some ARM devices, like the Sheevaplug.
             if key in ['model name', 'Processor', 'vendor_id', 'cpu', 'Vendor', 'processor']:
@@ -300,12 +302,9 @@ class LinuxHardware(Hardware):
             )
         except AttributeError:
             # In Python < 3.3, os.sched_getaffinity() is not available
-            try:
-                cmd = get_bin_path('nproc')
-            except ValueError:
-                pass
-            else:
-                rc, out, _err = self.module.run_command(cmd)
+            nproc_cmd = self.module.get_bin_path('nproc')
+            if nproc_cmd is not None:
+                rc, out, _err = self.module.run_command(nproc_cmd)
                 if rc == 0:
                     cpu_facts['processor_nproc'] = int(out)
 
@@ -370,7 +369,6 @@ class LinuxHardware(Hardware):
 
         else:
             # Fall back to using dmidecode, if available
-            dmi_bin = self.module.get_bin_path('dmidecode')
             DMI_DICT = {
                 'bios_date': 'bios-release-date',
                 'bios_vendor': 'bios-vendor',
@@ -391,25 +389,54 @@ class LinuxHardware(Hardware):
                 'product_version': 'system-version',
                 'system_vendor': 'system-manufacturer',
             }
+            dmi_bin = self.module.get_bin_path('dmidecode')
+            if dmi_bin is None:
+                dmi_facts = dict.fromkeys(
+                    DMI_DICT.keys(),
+                    'NA'
+                )
+                return dmi_facts
+
             for (k, v) in DMI_DICT.items():
-                if dmi_bin is not None:
-                    (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
-                    if rc == 0:
-                        # Strip out commented lines (specific dmidecode output)
-                        thisvalue = ''.join([line for line in out.splitlines() if not line.startswith('#')])
-                        try:
-                            json.dumps(thisvalue)
-                        except UnicodeDecodeError:
-                            thisvalue = "NA"
+                (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))
+                if rc == 0:
+                    # Strip out commented lines (specific dmidecode output)
+                    thisvalue = ''.join([line for line in out.splitlines() if not line.startswith('#')])
+                    try:
+                        json.dumps(thisvalue)
+                    except UnicodeDecodeError:
+                        thisvalue = "NA"
 
-                        dmi_facts[k] = thisvalue
-                    else:
-                        dmi_facts[k] = 'NA'
+                    dmi_facts[k] = thisvalue
                 else:
                     dmi_facts[k] = 'NA'
 
         return dmi_facts
 
+    def get_sysinfo_facts(self):
+        """Fetch /proc/sysinfo facts from s390 Linux on IBM Z"""
+        if not os.path.exists('/proc/sysinfo'):
+            return {}
+
+        sysinfo_facts = dict.fromkeys(
+            ('system_vendor', 'product_version', 'product_serial', 'product_name', 'product_uuid'),
+            'NA'
+        )
+        sysinfo_re = re.compile(
+            r'''
+                ^
+                    (?:Manufacturer:\s+(?P<system_vendor>.+))|
+                    (?:Type:\s+(?P<product_name>.+))|
+                    (?:Sequence\ Code:\s+0+(?P<product_serial>.+))
+                $
+            ''',
+            re.VERBOSE | re.MULTILINE
+        )
+        data = get_file_content('/proc/sysinfo')
+        for match in sysinfo_re.finditer(data):
+            sysinfo_facts.update({k: v for k, v in match.groupdict().items() if v is not None})
+        return sysinfo_facts
+
     def _run_lsblk(self, lsblk_path):
         # call lsblk and collect all uuids
         # --exclude 2 makes lsblk ignore floppy disks, which are slower to answer than typical timeouts
@@ -548,7 +575,7 @@ class LinuxHardware(Hardware):
 
         # start threads to query each mount
         results = {}
-        pool = ThreadPool(processes=min(len(mtab_entries), cpu_count()))
+        executor = _futures.DaemonThreadPoolExecutor()
         maxtime = timeout.GATHER_TIMEOUT or timeout.DEFAULT_GATHER_TIMEOUT
         for fields in mtab_entries:
             # Transform octal escape sequences
@@ -572,30 +599,29 @@ class LinuxHardware(Hardware):
                 if not self.MTAB_BIND_MOUNT_RE.match(options):
                     mount_info['options'] += ",bind"
 
-            results[mount] = {'info': mount_info,
-                              'extra': pool.apply_async(self.get_mount_info, (mount, device, uuids)),
-                              'timelimit': time.time() + maxtime}
+            results[mount] = {'info': mount_info, 'timelimit': time.monotonic() + maxtime}
+            results[mount]['extra'] = executor.submit(self.get_mount_info, mount, device, uuids)
 
-        pool.close()  # done with new workers, start gc
+        # done with spawning new workers, start gc
+        executor.shutdown()
 
-        # wait for workers and get results
-        while results:
+        while results:  # wait for workers and get results
             for mount in list(results):
                 done = False
                 res = results[mount]['extra']
                 try:
-                    if res.ready():
+                    if res.done():
                         done = True
-                        if res.successful():
-                            mount_size, uuid = res.get()
+                        if res.exception() is None:
+                            mount_size, uuid = res.result()
                             if mount_size:
                                 results[mount]['info'].update(mount_size)
                             results[mount]['info']['uuid'] = uuid or 'N/A'
                         else:
                             # failed, try to find out why, if 'res.successful' we know there are no exceptions
-                            results[mount]['info']['note'] = 'Could not get extra information: %s.' % (to_text(res.get()))
+                            results[mount]['info']['note'] = f'Could not get extra information: {res.exception()}'
 
-                    elif time.time() > results[mount]['timelimit']:
+                    elif time.monotonic() > results[mount]['timelimit']:
                         done = True
                         self.module.warn("Timeout exceeded when getting mount info for %s" % mount)
                         results[mount]['info']['note'] = 'Could not get extra information due to timeout'
@@ -744,10 +770,24 @@ class LinuxHardware(Hardware):
                 if serial:
                     d['serial'] = serial
 
-            for key, test in [('removable', '/removable'),
-                              ('support_discard', '/queue/discard_granularity'),
-                              ]:
-                d[key] = get_file_content(sysdir + test)
+            d['removable'] = get_file_content(sysdir + '/removable')
+
+            # Historically, `support_discard` simply returned the value of
+            # `/sys/block/{device}/queue/discard_granularity`. When its value
+            # is `0`, then the block device doesn't support discards;
+            # _however_, it being greater than zero doesn't necessarily mean
+            # that the block device _does_ support discards.
+            #
+            # Another indication that a block device doesn't support discards
+            # is `/sys/block/{device}/queue/discard_max_hw_bytes` being equal
+            # to `0` (with the same caveat as above). So if either of those are
+            # `0`, set `support_discard` to zero, otherwise set it to the value
+            # of `discard_granularity` for backwards compatibility.
+            d['support_discard'] = (
+                '0'
+                if get_file_content(sysdir + '/queue/discard_max_hw_bytes') == '0'
+                else get_file_content(sysdir + '/queue/discard_granularity')
+            )
 
             if diskname in devs_wwn:
                 d['wwn'] = devs_wwn[diskname]
@@ -765,12 +805,12 @@ class LinuxHardware(Hardware):
                         part['links'][link_type] = link_values.get(partname, [])
 
                     part['start'] = get_file_content(part_sysdir + "/start", 0)
-                    part['sectors'] = get_file_content(part_sysdir + "/size", 0)
-
                     part['sectorsize'] = get_file_content(part_sysdir + "/queue/logical_block_size")
                     if not part['sectorsize']:
                         part['sectorsize'] = get_file_content(part_sysdir + "/queue/hw_sector_size", 512)
-                    part['size'] = bytes_to_human((float(part['sectors']) * 512.0))
+                    # sysfs sectorcount assumes 512 blocksize. Convert using the correct sectorsize
+                    part['sectors'] = int(get_file_content(part_sysdir + "/size", 0)) * 512 // int(part['sectorsize'])
+                    part['size'] = bytes_to_human(float(part['sectors']) * float(part['sectorsize']))
                     part['uuid'] = get_partition_uuid(partname)
                     self.get_holders(part, part_sysdir)
 
@@ -784,13 +824,14 @@ class LinuxHardware(Hardware):
                 if m:
                     d['scheduler_mode'] = m.group(2)
 
-            d['sectors'] = get_file_content(sysdir + "/size")
-            if not d['sectors']:
-                d['sectors'] = 0
             d['sectorsize'] = get_file_content(sysdir + "/queue/logical_block_size")
             if not d['sectorsize']:
                 d['sectorsize'] = get_file_content(sysdir + "/queue/hw_sector_size", 512)
-            d['size'] = bytes_to_human(float(d['sectors']) * 512.0)
+            # sysfs sectorcount assumes 512 blocksize. Convert using the correct sectorsize
+            d['sectors'] = int(get_file_content(sysdir + "/size")) * 512 // int(d['sectorsize'])
+            if not d['sectors']:
+                d['sectors'] = 0
+            d['size'] = bytes_to_human(float(d['sectors']) * float(d['sectorsize']))
 
             d['host'] = ""
 
@@ -833,21 +874,24 @@ class LinuxHardware(Hardware):
         """ Get LVM Facts if running as root and lvm utils are available """
 
         lvm_facts = {'lvm': 'N/A'}
+        vgs_cmd = self.module.get_bin_path('vgs')
+        if vgs_cmd is None:
+            return lvm_facts
 
-        if os.getuid() == 0 and self.module.get_bin_path('vgs'):
+        if os.getuid() == 0:
             lvm_util_options = '--noheadings --nosuffix --units g --separator ,'
 
-            vgs_path = self.module.get_bin_path('vgs')
             # vgs fields: VG #PV #LV #SN Attr VSize VFree
             vgs = {}
-            if vgs_path:
-                rc, vg_lines, err = self.module.run_command('%s %s' % (vgs_path, lvm_util_options))
-                for vg_line in vg_lines.splitlines():
-                    items = vg_line.strip().split(',')
-                    vgs[items[0]] = {'size_g': items[-2],
-                                     'free_g': items[-1],
-                                     'num_lvs': items[2],
-                                     'num_pvs': items[1]}
+            rc, vg_lines, err = self.module.run_command('%s %s' % (vgs_cmd, lvm_util_options))
+            for vg_line in vg_lines.splitlines():
+                items = vg_line.strip().split(',')
+                vgs[items[0]] = {
+                    'size_g': items[-2],
+                    'free_g': items[-1],
+                    'num_lvs': items[2],
+                    'num_pvs': items[1]
+                }
 
             lvs_path = self.module.get_bin_path('lvs')
             # lvs fields:

ansible/module_utils/facts/hardware/netbsd.py

@@ -162,6 +162,9 @@ class NetBSDHardware(Hardware):
     def get_uptime_facts(self):
         # On NetBSD, we need to call sysctl with -n to get this value as an int.
         sysctl_cmd = self.module.get_bin_path('sysctl')
+        if sysctl_cmd is None:
+            return {}
+
         cmd = [sysctl_cmd, '-n', 'kern.boottime']
 
         rc, out, err = self.module.run_command(cmd)

ansible/module_utils/facts/hardware/openbsd.py

@@ -54,7 +54,7 @@ class OpenBSDHardware(Hardware):
         hardware_facts.update(self.get_dmi_facts())
         hardware_facts.update(self.get_uptime_facts())
 
-        # storage devices notorioslly prone to hang/block so they are under a timeout
+        # storage devices notoriously prone to hang/block so they are under a timeout
         try:
             hardware_facts.update(self.get_mount_facts())
         except timeout.TimeoutError:
@@ -113,6 +113,9 @@ class OpenBSDHardware(Hardware):
     def get_uptime_facts(self):
         # On openbsd, we need to call it with -n to get this value as an int.
         sysctl_cmd = self.module.get_bin_path('sysctl')
+        if sysctl_cmd is None:
+            return {}
+
         cmd = [sysctl_cmd, '-n', 'kern.boottime']
 
         rc, out, err = self.module.run_command(cmd)

ansible/module_utils/facts/hardware/sunos.py

@@ -172,7 +172,13 @@ class SunOSHardware(Hardware):
         rc, platform, err = self.module.run_command('/usr/bin/uname -i')
         platform_sbin = '/usr/platform/' + platform.rstrip() + '/sbin'
 
-        prtdiag_path = self.module.get_bin_path("prtdiag", opt_dirs=[platform_sbin])
+        prtdiag_path = self.module.get_bin_path(
+            "prtdiag",
+            opt_dirs=[platform_sbin]
+        )
+        if prtdiag_path is None:
+            return dmi_facts
+
         rc, out, err = self.module.run_command(prtdiag_path)
         # rc returns 1
         if out:

ansible/module_utils/facts/network/aix.py

@@ -32,20 +32,21 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
         interface = dict(v4={}, v6={})
 
         netstat_path = self.module.get_bin_path('netstat')
-
-        if netstat_path:
-            rc, out, err = self.module.run_command([netstat_path, '-nr'])
-
-            lines = out.splitlines()
-            for line in lines:
-                words = line.split()
-                if len(words) > 1 and words[0] == 'default':
-                    if '.' in words[1]:
-                        interface['v4']['gateway'] = words[1]
-                        interface['v4']['interface'] = words[5]
-                    elif ':' in words[1]:
-                        interface['v6']['gateway'] = words[1]
-                        interface['v6']['interface'] = words[5]
+        if netstat_path is None:
+            return interface['v4'], interface['v6']
+
+        rc, out, err = self.module.run_command([netstat_path, '-nr'])
+
+        lines = out.splitlines()
+        for line in lines:
+            words = line.split()
+            if len(words) > 1 and words[0] == 'default':
+                if '.' in words[1]:
+                    interface['v4']['gateway'] = words[1]
+                    interface['v4']['interface'] = words[5]
+                elif ':' in words[1]:
+                    interface['v6']['gateway'] = words[1]
+                    interface['v6']['interface'] = words[5]
 
         return interface['v4'], interface['v6']
 
@@ -58,9 +59,7 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
             all_ipv6_addresses=[],
         )
 
-        uname_rc = None
-        uname_out = None
-        uname_err = None
+        uname_rc = uname_out = uname_err = None
         uname_path = self.module.get_bin_path('uname')
         if uname_path:
             uname_rc, uname_out, uname_err = self.module.run_command([uname_path, '-W'])

ansible/module_utils/facts/network/fc_wwn.py

@@ -82,7 +82,10 @@ class FcWwnInitiatorFactCollector(BaseFactCollector):
                                         fc_facts['fibre_channel_wwn'].append(data[-1].rstrip())
         elif sys.platform.startswith('hp-ux'):
             cmd = module.get_bin_path('ioscan')
-            fcmsu_cmd = module.get_bin_path('fcmsutil', opt_dirs=['/opt/fcms/bin'])
+            fcmsu_cmd = module.get_bin_path(
+                'fcmsutil',
+                opt_dirs=['/opt/fcms/bin'],
+            )
             # go ahead if we have both commands available
             if cmd and fcmsu_cmd:
                 # ioscan / get list of available fibre-channel devices (fcd)

ansible/module_utils/facts/network/hpux.py

@@ -20,7 +20,7 @@ from ansible.module_utils.facts.network.base import Network, NetworkCollector
 
 class HPUXNetwork(Network):
     """
-    HP-UX-specifig subclass of Network. Defines networking facts:
+    HP-UX-specific subclass of Network. Defines networking facts:
     - default_interface
     - interfaces (a list of interface names)
     - interface_<name> dictionary of ipv4 address information.
@@ -29,7 +29,10 @@ class HPUXNetwork(Network):
 
     def populate(self, collected_facts=None):
         network_facts = {}
-        netstat_path = self.module.get_bin_path('netstat')
+        netstat_path = self.module.get_bin_path(
+            'netstat',
+            opt_dirs=['/usr/bin']
+        )
 
         if netstat_path is None:
             return network_facts
@@ -46,7 +49,14 @@ class HPUXNetwork(Network):
 
     def get_default_interfaces(self):
         default_interfaces = {}
-        rc, out, err = self.module.run_command("/usr/bin/netstat -nr")
+        netstat_path = self.module.get_bin_path(
+            'netstat',
+            opt_dirs=['/usr/bin']
+        )
+
+        if netstat_path is None:
+            return default_interfaces
+        rc, out, err = self.module.run_command("%s -nr" % netstat_path)
         lines = out.splitlines()
         for line in lines:
             words = line.split()
@@ -59,7 +69,14 @@ class HPUXNetwork(Network):
 
     def get_interfaces_info(self):
         interfaces = {}
-        rc, out, err = self.module.run_command("/usr/bin/netstat -niw")
+        netstat_path = self.module.get_bin_path(
+            'netstat',
+            opt_dirs=['/usr/bin']
+        )
+
+        if netstat_path is None:
+            return interfaces
+        rc, out, err = self.module.run_command("%s -niw" % netstat_path)
         lines = out.splitlines()
         for line in lines:
             words = line.split()

ansible/module_utils/facts/network/iscsi.py

@@ -21,7 +21,6 @@ import sys
 
 import ansible.module_utils.compat.typing as t
 
-from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.facts.utils import get_file_content
 from ansible.module_utils.facts.network.base import NetworkCollector
 
@@ -80,9 +79,8 @@ class IscsiInitiatorNetworkCollector(NetworkCollector):
                     iscsi_facts['iscsi_iqn'] = line.split('=', 1)[1]
                     break
         elif sys.platform.startswith('aix'):
-            try:
-                cmd = get_bin_path('lsattr')
-            except ValueError:
+            cmd = module.get_bin_path('lsattr')
+            if cmd is None:
                 return iscsi_facts
 
             cmd += " -E -l iscsi0"
@@ -92,10 +90,11 @@ class IscsiInitiatorNetworkCollector(NetworkCollector):
                 iscsi_facts['iscsi_iqn'] = line.split()[1].rstrip()
 
         elif sys.platform.startswith('hp-ux'):
-            # try to find it in the default PATH and opt_dirs
-            try:
-                cmd = get_bin_path('iscsiutil', opt_dirs=['/opt/iscsi/bin'])
-            except ValueError:
+            cmd = module.get_bin_path(
+                'iscsiutil',
+                opt_dirs=['/opt/iscsi/bin']
+            )
+            if cmd is None:
                 return iscsi_facts
 
             cmd += " -l"

ansible/module_utils/facts/network/linux.py

@@ -295,8 +295,6 @@ class LinuxNetwork(Network):
                         if not address == '::1':
                             ips['all_ipv6_addresses'].append(address)
 
-            ip_path = self.module.get_bin_path("ip")
-
             args = [ip_path, 'addr', 'show', 'primary', 'dev', device]
             rc, primary_data, stderr = self.module.run_command(args, errors='surrogate_then_replace')
             if rc == 0:

ansible/module_utils/facts/other/facter.py

@@ -22,8 +22,14 @@ class FacterFactCollector(BaseFactCollector):
                                                   namespace=namespace)
 
     def find_facter(self, module):
-        facter_path = module.get_bin_path('facter', opt_dirs=['/opt/puppetlabs/bin'])
-        cfacter_path = module.get_bin_path('cfacter', opt_dirs=['/opt/puppetlabs/bin'])
+        facter_path = module.get_bin_path(
+            'facter',
+            opt_dirs=['/opt/puppetlabs/bin']
+        )
+        cfacter_path = module.get_bin_path(
+            'cfacter',
+            opt_dirs=['/opt/puppetlabs/bin']
+        )
 
         # Prefer to use cfacter if available
         if cfacter_path is not None:
@@ -73,7 +79,6 @@ class FacterFactCollector(BaseFactCollector):
         try:
             facter_dict = json.loads(facter_output)
         except Exception:
-            # FIXME: maybe raise a FactCollectorError with some info attrs?
-            pass
+            module.warn("Failed to parse facter facts")
 
         return facter_dict

ansible/module_utils/facts/other/ohai.py

@@ -36,10 +36,11 @@ class OhaiFactCollector(BaseFactCollector):
                                                 namespace=namespace)
 
     def find_ohai(self, module):
-        ohai_path = module.get_bin_path('ohai')
-        return ohai_path
+        return module.get_bin_path(
+            'ohai'
+        )
 
-    def run_ohai(self, module, ohai_path,):
+    def run_ohai(self, module, ohai_path):
         rc, out, err = module.run_command(ohai_path)
         return rc, out, err
 
@@ -67,7 +68,6 @@ class OhaiFactCollector(BaseFactCollector):
         try:
             ohai_facts = json.loads(ohai_output)
         except Exception:
-            # FIXME: useful error, logging, something...
-            pass
+            module.warn("Failed to gather ohai facts")
 
         return ohai_facts