ansible: stop passing through remote_tmp variable

Ansiballz does not use remote_tmp so neither should we, per #239.
pull/244/head
David Wilson 7 years ago
parent f9e1905ec6
commit f737ff5276

@ -319,7 +319,6 @@ class ActionModuleMixin(ansible.plugins.action.ActionBase):
connection=self._connection, connection=self._connection,
module_name=mitogen.utils.cast(module_name), module_name=mitogen.utils.cast(module_name),
module_args=mitogen.utils.cast(module_args), module_args=mitogen.utils.cast(module_args),
remote_tmp=mitogen.utils.cast(self._get_remote_tmp()),
task_vars=task_vars, task_vars=task_vars,
templar=self._templar, templar=self._templar,
env=mitogen.utils.cast(env), env=mitogen.utils.cast(env),

@ -92,7 +92,7 @@ class Invocation(object):
target.run_module() or helpers.run_module_async() in the target context. target.run_module() or helpers.run_module_async() in the target context.
""" """
def __init__(self, action, connection, module_name, module_args, def __init__(self, action, connection, module_name, module_args,
remote_tmp, task_vars, templar, env, wrap_async): task_vars, templar, env, wrap_async):
#: ActionBase instance invoking the module. Required to access some #: ActionBase instance invoking the module. Required to access some
#: output postprocessing methods that don't belong in ActionBase at #: output postprocessing methods that don't belong in ActionBase at
#: all. #: all.
@ -104,9 +104,6 @@ class Invocation(object):
self.module_name = module_name self.module_name = module_name
#: Final module arguments. #: Final module arguments.
self.module_args = module_args self.module_args = module_args
#: Value of 'remote_tmp' parameter, to allow target to create temporary
#: files in correct location.
self.remote_tmp = remote_tmp
#: Task variables, needed to extract ansible_*_interpreter. #: Task variables, needed to extract ansible_*_interpreter.
self.task_vars = task_vars self.task_vars = task_vars
#: Templar, needed to extract ansible_*_interpreter. #: Templar, needed to extract ansible_*_interpreter.
@ -198,7 +195,6 @@ class BinaryPlanner(Planner):
path=invocation.module_path, path=invocation.module_path,
args=invocation.module_args, args=invocation.module_args,
env=invocation.env, env=invocation.env,
remote_tmp=invocation.remote_tmp,
**kwargs **kwargs
) )

@ -92,15 +92,14 @@ class Runner(object):
Subclasses may override `_run`()` and extend `setup()` and `revert()`. Subclasses may override `_run`()` and extend `setup()` and `revert()`.
""" """
def __init__(self, module, remote_tmp, service_context, def __init__(self, module, service_context, emulate_tty=None,
emulate_tty=None, raw_params=None, args=None, env=None): raw_params=None, args=None, env=None):
if args is None: if args is None:
args = {} args = {}
if raw_params is not None: if raw_params is not None:
args['_raw_params'] = raw_params args['_raw_params'] = raw_params
self.module = utf8(module) self.module = utf8(module)
self.remote_tmp = utf8(os.path.expanduser(remote_tmp))
self.service_context = service_context self.service_context = service_context
self.emulate_tty = emulate_tty self.emulate_tty = emulate_tty
self.raw_params = raw_params self.raw_params = raw_params

@ -239,8 +239,8 @@ def reset_temp_dir(econtext):
""" """
Create one temporary directory to be reused by all runner.py invocations Create one temporary directory to be reused by all runner.py invocations
for the lifetime of the process. The temporary directory is changed for for the lifetime of the process. The temporary directory is changed for
each forked job, and emptied as necessary runner.py::_cleanup_temp() after each forked job, and emptied as necessary by runner.py::_cleanup_temp()
each module invocation. after each module invocation.
The result is that a context need only create and delete one directory The result is that a context need only create and delete one directory
during startup and shutdown, and no further filesystem writes need occur during startup and shutdown, and no further filesystem writes need occur

Loading…
Cancel
Save