mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
async: use async_dir for the async results file directory (#45461)
* win async: use async_dir for the async results file directory * tried to unify POSIX and PowerShell async implementations of async_dir * fix sanity issue
This commit is contained in:
@@ -734,6 +734,30 @@ class ActionBase(with_metaclass(ABCMeta, object)):
|
||||
|
||||
self._update_module_args(module_name, module_args, task_vars)
|
||||
|
||||
# FIXME: convert async_wrapper.py to not rely on environment variables
|
||||
# make sure we get the right async_dir variable, backwards compatibility
|
||||
# means we need to lookup the env value ANSIBLE_ASYNC_DIR first
|
||||
remove_async_dir = None
|
||||
if wrap_async or self._task.async_val:
|
||||
env_async_dir = [e for e in self._task.environment if
|
||||
"ANSIBLE_ASYNC_DIR" in e]
|
||||
if len(env_async_dir) > 0:
|
||||
msg = "Setting the async dir from the environment keyword " \
|
||||
"ANSIBLE_ASYNC_DIR is deprecated. Set the async_dir " \
|
||||
"shell option instead"
|
||||
self._display.deprecated(msg, "2.12")
|
||||
else:
|
||||
# ANSIBLE_ASYNC_DIR is not set on the task, we get the value
|
||||
# from the shell option and temporarily add to the environment
|
||||
# list for async_wrapper to pick up
|
||||
try:
|
||||
async_dir = self._connection._shell.get_option('async_dir')
|
||||
except KeyError:
|
||||
# in case 3rd party plugin has not set this, use the default
|
||||
async_dir = "~/.ansible_async"
|
||||
remove_async_dir = len(self._task.environment)
|
||||
self._task.environment.append({"ANSIBLE_ASYNC_DIR": async_dir})
|
||||
|
||||
# FUTURE: refactor this along with module build process to better encapsulate "smart wrapper" functionality
|
||||
(module_style, shebang, module_data, module_path) = self._configure_module(module_name=module_name, module_args=module_args, task_vars=task_vars)
|
||||
display.vvv("Using module file %s" % module_path)
|
||||
@@ -776,6 +800,12 @@ class ActionBase(with_metaclass(ABCMeta, object)):
|
||||
|
||||
environment_string = self._compute_environment_string()
|
||||
|
||||
# remove the ANSIBLE_ASYNC_DIR env entry if we added a temporary one for
|
||||
# the async_wrapper task - this is so the async_status plugin doesn't
|
||||
# fire a deprecation warning when it runs after this task
|
||||
if remove_async_dir is not None:
|
||||
del self._task.environment[remove_async_dir]
|
||||
|
||||
remote_files = []
|
||||
if tmpdir and remote_module_path:
|
||||
remote_files = [tmpdir, remote_module_path]
|
||||
|
||||
51
lib/ansible/plugins/action/async_status.py
Normal file
51
lib/ansible/plugins/action/async_status.py
Normal file
@@ -0,0 +1,51 @@
|
||||
# Copyright: (c) 2018, Ansible Project
|
||||
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.errors import AnsibleError
|
||||
from ansible.plugins.action import ActionBase
|
||||
from ansible.utils.vars import merge_hash
|
||||
|
||||
|
||||
class ActionModule(ActionBase):
|
||||
|
||||
_VALID_ARGS = frozenset(('jid', 'mode'))
|
||||
|
||||
def run(self, tmp=None, task_vars=None):
|
||||
results = super(ActionModule, self).run(tmp, task_vars)
|
||||
del tmp # tmp no longer has any effect
|
||||
|
||||
if "jid" not in self._task.args:
|
||||
raise AnsibleError("jid is required")
|
||||
jid = self._task.args["jid"]
|
||||
mode = self._task.args.get("mode", "status")
|
||||
|
||||
env_async_dir = [e for e in self._task.environment if
|
||||
"ANSIBLE_ASYNC_DIR" in e]
|
||||
if len(env_async_dir) > 0:
|
||||
# for backwards compatibility we need to get the dir from
|
||||
# ANSIBLE_ASYNC_DIR that is defined in the environment. This is
|
||||
# deprecated and will be removed in favour of shell options
|
||||
async_dir = env_async_dir[0]['ANSIBLE_ASYNC_DIR']
|
||||
|
||||
msg = "Setting the async dir from the environment keyword " \
|
||||
"ANSIBLE_ASYNC_DIR is deprecated. Set the async_dir " \
|
||||
"shell option instead"
|
||||
self._display.deprecated(msg, "2.12")
|
||||
else:
|
||||
# inject the async directory based on the shell option into the
|
||||
# module args
|
||||
try:
|
||||
async_dir = self._connection._shell.get_option('async_dir')
|
||||
except KeyError:
|
||||
# here for 3rd party shell plugin compatibility in case they do
|
||||
# not define the async_dir option
|
||||
async_dir = "~/.ansible_async"
|
||||
|
||||
module_args = dict(jid=jid, mode=mode, _async_dir=async_dir)
|
||||
status = self._execute_module(task_vars=task_vars,
|
||||
module_args=module_args)
|
||||
results = merge_hash(results, status)
|
||||
return results
|
||||
Reference in New Issue
Block a user