ansible-core 2.17.4rc1__py3-none-any.whl → 2.18.0b1__py3-none-any.whl

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

ansible/module_utils/facts/packages.py

@@ -3,24 +3,29 @@
 
 from __future__ import annotations
 
+import ansible.module_utils.compat.typing as t
+
 from abc import ABCMeta, abstractmethod
 
 from ansible.module_utils.six import with_metaclass
+from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils.common.process import get_bin_path
+from ansible.module_utils.common.respawn import has_respawned, probe_interpreters_for_module, respawn_module
 from ansible.module_utils.common._utils import get_all_subclasses
 
 
 def get_all_pkg_managers():
 
-    return {obj.__name__.lower(): obj for obj in get_all_subclasses(PkgMgr) if obj not in (CLIMgr, LibMgr)}
+    return {obj.__name__.lower(): obj for obj in get_all_subclasses(PkgMgr) if obj not in (CLIMgr, LibMgr, RespawningLibMgr)}
 
 
 class PkgMgr(with_metaclass(ABCMeta, object)):  # type: ignore[misc]
 
     @abstractmethod
-    def is_available(self):
+    def is_available(self, handle_exceptions):
         # This method is supposed to return True/False if the package manager is currently installed/usable
         # It can also 'prep' the required systems in the process of detecting availability
+        # If handle_exceptions is false it should raise exceptions related to manager discovery instead of handling them.
         pass
 
     @abstractmethod
@@ -58,16 +63,50 @@ class LibMgr(PkgMgr):
         self._lib = None
         super(LibMgr, self).__init__()
 
-    def is_available(self):
+    def is_available(self, handle_exceptions=True):
         found = False
         try:
             self._lib = __import__(self.LIB)
             found = True
         except ImportError:
-            pass
+            if not handle_exceptions:
+                raise Exception(missing_required_lib(self.LIB))
         return found
 
 
+class RespawningLibMgr(LibMgr):
+
+    CLI_BINARIES = []   # type: t.List[str]
+    INTERPRETERS = ['/usr/bin/python3']
+
+    def is_available(self, handle_exceptions=True):
+        if super(RespawningLibMgr, self).is_available():
+            return True
+
+        for binary in self.CLI_BINARIES:
+            try:
+                bin_path = get_bin_path(binary)
+            except ValueError:
+                # Not an interesting exception to raise, just a speculative probe
+                continue
+            else:
+                # It looks like this package manager is installed
+                if not has_respawned():
+                    # See if respawning will help
+                    interpreter_path = probe_interpreters_for_module(self.INTERPRETERS, self.LIB)
+                    if interpreter_path:
+                        respawn_module(interpreter_path)
+                        # The module will exit when the respawned copy completes
+
+                if not handle_exceptions:
+                    raise Exception(f'Found executable at {bin_path}. {missing_required_lib(self.LIB)}')
+
+        if not handle_exceptions:
+            raise Exception(missing_required_lib(self.LIB))
+
+        return False
+
+
 class CLIMgr(PkgMgr):
 
     CLI = None  # type: str | None
@@ -77,9 +116,12 @@ class CLIMgr(PkgMgr):
         self._cli = None
         super(CLIMgr, self).__init__()
 
-    def is_available(self):
+    def is_available(self, handle_exceptions=True):
+        found = False
         try:
             self._cli = get_bin_path(self.CLI)
+            found = True
         except ValueError:
-            return False
-        return True
+            if not handle_exceptions:
+                raise
+        return found

ansible/module_utils/facts/sysctl.py

@@ -21,41 +21,43 @@ from ansible.module_utils.common.text.converters import to_text
 
 
 def get_sysctl(module, prefixes):
-    sysctl_cmd = module.get_bin_path('sysctl')
-    cmd = [sysctl_cmd]
-    cmd.extend(prefixes)
 
     sysctl = dict()
-
-    try:
-        rc, out, err = module.run_command(cmd)
-    except (IOError, OSError) as e:
-        module.warn('Unable to read sysctl: %s' % to_text(e))
-        rc = 1
-
-    if rc == 0:
-        key = ''
-        value = ''
-        for line in out.splitlines():
-            if not line.strip():
-                continue
-
-            if line.startswith(' '):
-                # handle multiline values, they will not have a starting key
-                # Add the newline back in so people can split on it to parse
-                # lines if they need to.
-                value += '\n' + line
-                continue
+    sysctl_cmd = module.get_bin_path('sysctl')
+    if sysctl_cmd is not None:
+
+        cmd = [sysctl_cmd]
+        cmd.extend(prefixes)
+
+        try:
+            rc, out, err = module.run_command(cmd)
+        except (IOError, OSError) as e:
+            module.warn('Unable to read sysctl: %s' % to_text(e))
+            rc = 1
+
+        if rc == 0:
+            key = ''
+            value = ''
+            for line in out.splitlines():
+                if not line.strip():
+                    continue
+
+                if line.startswith(' '):
+                    # handle multiline values, they will not have a starting key
+                    # Add the newline back in so people can split on it to parse
+                    # lines if they need to.
+                    value += '\n' + line
+                    continue
+
+                if key:
+                    sysctl[key] = value.strip()
+
+                try:
+                    (key, value) = re.split(r'\s?=\s?|: ', line, maxsplit=1)
+                except Exception as e:
+                    module.warn('Unable to split sysctl line (%s): %s' % (to_text(line), to_text(e)))
 
             if key:
                 sysctl[key] = value.strip()
 
-            try:
-                (key, value) = re.split(r'\s?=\s?|: ', line, maxsplit=1)
-            except Exception as e:
-                module.warn('Unable to split sysctl line (%s): %s' % (to_text(line), to_text(e)))
-
-        if key:
-            sysctl[key] = value.strip()
-
     return sysctl

ansible/module_utils/facts/system/distribution.py

@@ -517,7 +517,7 @@ class Distribution(object):
                                 'Linux Mint', 'SteamOS', 'Devuan', 'Kali', 'Cumulus Linux',
                                 'Pop!_OS', 'Parrot', 'Pardus GNU/Linux', 'Uos', 'Deepin', 'OSMC'],
                      'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed',
-                              'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap', 'ALP-Dolomite'],
+                              'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap', 'ALP-Dolomite', 'SL-Micro'],
                      'Archlinux': ['Archlinux', 'Antergos', 'Manjaro'],
                      'Mandrake': ['Mandrake', 'Mandriva'],
                      'Solaris': ['Solaris', 'Nexenta', 'OmniOS', 'OpenIndiana', 'SmartOS'],

ansible/module_utils/facts/system/local.py

@@ -1,17 +1,5 @@
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright: Contributors to the Ansible project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import annotations
 
@@ -25,7 +13,6 @@ import ansible.module_utils.compat.typing as t
 from ansible.module_utils.common.text.converters import to_text
 from ansible.module_utils.facts.utils import get_file_content
 from ansible.module_utils.facts.collector import BaseFactCollector
-from ansible.module_utils.six import PY3
 from ansible.module_utils.six.moves import configparser, StringIO
 
 
@@ -91,12 +78,9 @@ class LocalFactCollector(BaseFactCollector):
                 # if that fails read it with ConfigParser
                 cp = configparser.ConfigParser()
                 try:
-                    if PY3:
-                        cp.read_file(StringIO(out))
-                    else:
-                        cp.readfp(StringIO(out))
+                    cp.read_file(StringIO(out))
                 except configparser.Error:
-                    fact = "error loading facts as JSON or ini - please check content: %s" % fn
+                    fact = f"error loading facts as JSON or ini - please check content: {fn}"
                     module.warn(fact)
                 else:
                     fact = {}
@@ -104,8 +88,14 @@ class LocalFactCollector(BaseFactCollector):
                         if sect not in fact:
                             fact[sect] = {}
                         for opt in cp.options(sect):
-                            val = cp.get(sect, opt)
-                            fact[sect][opt] = val
+                            try:
+                                val = cp.get(sect, opt)
+                            except configparser.Error as ex:
+                                fact = f"error loading facts as ini - please check content: {fn} ({ex})"
+                                module.warn(fact)
+                                continue
+                            else:
+                                fact[sect][opt] = val
             except Exception as e:
                 fact = "Failed to convert (%s) to JSON: %s" % (fn, to_text(e))
                 module.warn(fact)

ansible/module_utils/facts/system/service_mgr.py

@@ -106,7 +106,7 @@ class ServiceMgrFactCollector(BaseFactCollector):
             proc_1 = proc_1.strip()
 
         if proc_1 is not None and (proc_1 == 'init' or proc_1.endswith('sh')):
-            # many systems return init, so this cannot be trusted, if it ends in 'sh' it probalby is a shell in a container
+            # many systems return init, so this cannot be trusted, if it ends in 'sh' it probably is a shell in a container
             proc_1 = None
 
         # if not init/None it should be an identifiable or custom init, so we are done!
@@ -144,6 +144,8 @@ class ServiceMgrFactCollector(BaseFactCollector):
                 service_mgr_name = 'systemd'
             elif os.path.exists('/etc/init.d/'):
                 service_mgr_name = 'sysvinit'
+            elif os.path.exists('/etc/dinit.d/'):
+                service_mgr_name = 'dinit'
 
         if not service_mgr_name:
             # if we cannot detect, fallback to generic 'service'

ansible/module_utils/facts/system/systemd.py

@@ -0,0 +1,47 @@
+# Get systemd version and features
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import annotations
+
+import ansible.module_utils.compat.typing as t
+
+from ansible.module_utils.facts.collector import BaseFactCollector
+from ansible.module_utils.facts.system.service_mgr import ServiceMgrFactCollector
+
+
+class SystemdFactCollector(BaseFactCollector):
+    name = "systemd"
+    _fact_ids = set()  # type: t.Set[str]
+
+    def collect(self, module=None, collected_facts=None):
+        systemctl_bin = module.get_bin_path("systemctl")
+        systemd_facts = {}
+        if systemctl_bin and ServiceMgrFactCollector.is_systemd_managed(module):
+            rc, stdout, dummy = module.run_command(
+                [systemctl_bin, "--version"],
+                check_rc=False,
+            )
+
+            if rc != 0:
+                return systemd_facts
+
+            systemd_facts["systemd"] = {
+                "features": str(stdout.split("\n")[1]),
+                "version": int(stdout.split(" ")[1]),
+            }
+
+        return systemd_facts

ansible/module_utils/powershell/Ansible.ModuleUtils.AddType.psm1

@@ -37,7 +37,7 @@ Function Add-CSharpType {
     .PARAMETER CompileSymbols
     [String[]] A list of symbols to be defined during compile time. These are
     added to the existing symbols, 'CORECLR', 'WINDOWS', 'UNIX' that are set
-    conditionalls in this cmdlet.
+    conditionals in this cmdlet.
 
     .NOTES
     The following features were added to control the compiling options from the

ansible/module_utils/powershell/Ansible.ModuleUtils.CamelConversion.psm1

@@ -4,7 +4,7 @@
 # used by Convert-DictToSnakeCase to convert a string in camelCase
 # format to snake_case
 Function Convert-StringToSnakeCase($string) {
-    # cope with pluralized abbreaviations such as TargetGroupARNs
+    # cope with pluralized abbreviations such as TargetGroupARNs
     if ($string -cmatch "[A-Z]{3,}s") {
         $replacement_string = $string -creplace $matches[0], "_$($matches[0].ToLower())"
 

ansible/module_utils/splitter.py

@@ -81,7 +81,7 @@ def split_args(args):
     '''
 
     # the list of params parsed out of the arg string
-    # this is going to be the result value when we are donei
+    # this is going to be the result value when we are done
     params = []
 
     # here we encode the args, so we have a uniform charset to

ansible/modules/add_host.py

@@ -61,7 +61,7 @@ notes:
 - The alias O(host) of the parameter O(name) is only available on Ansible 2.4 and newer.
 - Since Ansible 2.4, the C(inventory_dir) variable is now set to V(None) instead of the 'global inventory source',
   because you can now have multiple sources.  An example was added that shows how to partially restore the previous behaviour.
-- Though this module does not change the remote host, we do provide 'changed' status as it can be useful for those trying to track inventory changes.
+- Though this module does not change the remote host, we do provide C(changed) status as it can be useful for those trying to track inventory changes.
 - The hosts added will not bypass the C(--limit) from the command line, so both of those need to be in agreement to make them available as play targets.
   They are still available from hostvars and for delegation as a normal part of the inventory.
 seealso: