diff --git a/ansible_mitogen/connection.py b/ansible_mitogen/connection.py index 5053a5f5b..2a4e6c1f4 100644 --- a/ansible_mitogen/connection.py +++ b/ansible_mitogen/connection.py @@ -633,7 +633,7 @@ def get_task_var(self, key, default=None): does not make sense to extract connection-related configuration for the delegated-to machine from them. """ - def _fetch_task_var(task_vars, key): + def _fetch_task_var(task_vars, key, default): """ Special helper func in case vars can be templated """ @@ -651,15 +651,16 @@ def _fetch_task_var(task_vars, key): escape_backslashes=False ) return val + return default task_vars = self._get_task_vars() if self.delegate_to_hostname is None: - return _fetch_task_var(task_vars, key) + return _fetch_task_var(task_vars, key, default) else: delegated_vars = task_vars['ansible_delegated_vars'] if self.delegate_to_hostname in delegated_vars: task_vars = delegated_vars[self.delegate_to_hostname] - return _fetch_task_var(task_vars, key) + return _fetch_task_var(task_vars, key, default) return default diff --git a/ansible_mitogen/transport_config.py b/ansible_mitogen/transport_config.py index 937755528..b865f8b4f 100644 --- a/ansible_mitogen/transport_config.py +++ b/ansible_mitogen/transport_config.py @@ -493,7 +493,9 @@ def port(self): return self._connection_option('port') def python_path(self, rediscover_python=False): - s = self._connection.get_task_var('ansible_python_interpreter') + s = self._connection.get_task_var('ansible_python_interpreter', + default=C.config.get_config_value('INTERPRETER_PYTHON', + variables=self._task_vars)) # #511, #536: executor/module_common.py::_get_shebang() hard-wires # "/usr/bin/python" as the default interpreter path if no other # interpreter is specified. @@ -703,6 +705,9 @@ def port(self): def python_path(self, rediscover_python=False): s = self._host_vars.get('ansible_python_interpreter') + if s is None: + s = C.config.get_config_value('INTERPRETER_PYTHON', + variables=self._task_vars) # #511, #536: executor/module_common.py::_get_shebang() hard-wires # "/usr/bin/python" as the default interpreter path if no other # interpreter is specified. diff --git a/docs/changelog.rst b/docs/changelog.rst index 23d3b327d..47bb04f7c 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -27,6 +27,7 @@ In progress (unreleased) with `meta: reset_connection` * :gh:issue:`1083` :mod:`ansible_mitogen`: Templated connection timeout (e.g. ``ansible_timeout``). +* :gh:issue:`740` respect `interpreter_python` global configuration variable v0.3.19 (2024-12-02)