mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
added ansible_remote_tmp inventory var (#26754)
* added ansible_remote_tmp inventory var * fixed horrible crime of no space after #
This commit is contained in:
parent
462444b2be
commit
84367eacef
4 changed files with 11 additions and 10 deletions
|
@ -847,7 +847,8 @@ DEFAULT_REMOTE_TMP:
|
||||||
env: [{name: ANSIBLE_REMOTE_TEMP}]
|
env: [{name: ANSIBLE_REMOTE_TEMP}]
|
||||||
ini:
|
ini:
|
||||||
- {key: remote_tmp, section: defaults}
|
- {key: remote_tmp, section: defaults}
|
||||||
vars: []
|
vars:
|
||||||
|
- name: ansible_remote_tmp
|
||||||
yaml: {key: defaults.remote_tmp}
|
yaml: {key: defaults.remote_tmp}
|
||||||
DEFAULT_REMOTE_USER:
|
DEFAULT_REMOTE_USER:
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -57,6 +57,7 @@ MAGIC_VARIABLE_MAPPING = dict(
|
||||||
connection=('ansible_connection', ),
|
connection=('ansible_connection', ),
|
||||||
remote_addr=('ansible_ssh_host', 'ansible_host'),
|
remote_addr=('ansible_ssh_host', 'ansible_host'),
|
||||||
remote_user=('ansible_ssh_user', 'ansible_user'),
|
remote_user=('ansible_ssh_user', 'ansible_user'),
|
||||||
|
remote_tmp_dir=('ansible_remote_tmp', ),
|
||||||
port=('ansible_ssh_port', 'ansible_port'),
|
port=('ansible_ssh_port', 'ansible_port'),
|
||||||
timeout=('ansible_ssh_timeout', 'ansible_timeout'),
|
timeout=('ansible_ssh_timeout', 'ansible_timeout'),
|
||||||
ssh_executable=('ansible_ssh_executable', ),
|
ssh_executable=('ansible_ssh_executable', ),
|
||||||
|
@ -168,6 +169,7 @@ class PlayContext(Base):
|
||||||
# (connection, port, remote_user, environment, no_log)
|
# (connection, port, remote_user, environment, no_log)
|
||||||
_docker_extra_args = FieldAttribute(isa='string')
|
_docker_extra_args = FieldAttribute(isa='string')
|
||||||
_remote_addr = FieldAttribute(isa='string')
|
_remote_addr = FieldAttribute(isa='string')
|
||||||
|
_remote_tmp_dir = FieldAttribute(isa='string', default=C.DEFAULT_REMOTE_TMP)
|
||||||
_password = FieldAttribute(isa='string')
|
_password = FieldAttribute(isa='string')
|
||||||
_private_key_file = FieldAttribute(isa='string', default=C.DEFAULT_PRIVATE_KEY_FILE)
|
_private_key_file = FieldAttribute(isa='string', default=C.DEFAULT_PRIVATE_KEY_FILE)
|
||||||
_timeout = FieldAttribute(isa='int', default=C.DEFAULT_TIMEOUT)
|
_timeout = FieldAttribute(isa='int', default=C.DEFAULT_TIMEOUT)
|
||||||
|
|
|
@ -241,11 +241,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
|
||||||
use_system_tmp = True
|
use_system_tmp = True
|
||||||
|
|
||||||
tmp_mode = 0o700
|
tmp_mode = 0o700
|
||||||
|
tmpdir = self._remote_expand_user(self._play_context.remote_tmp_dir, sudoable=False)
|
||||||
if use_system_tmp:
|
|
||||||
tmpdir = None
|
|
||||||
else:
|
|
||||||
tmpdir = self._remote_expand_user(C.DEFAULT_REMOTE_TMP, sudoable=False)
|
|
||||||
|
|
||||||
cmd = self._connection._shell.mkdtemp(basefile, use_system_tmp, tmp_mode, tmpdir)
|
cmd = self._connection._shell.mkdtemp(basefile, use_system_tmp, tmp_mode, tmpdir)
|
||||||
result = self._low_level_execute_command(cmd, sudoable=False)
|
result = self._low_level_execute_command(cmd, sudoable=False)
|
||||||
|
|
|
@ -110,14 +110,16 @@ class ShellBase(object):
|
||||||
# /var/tmp is not).
|
# /var/tmp is not).
|
||||||
|
|
||||||
if system:
|
if system:
|
||||||
if C.DEFAULT_REMOTE_TMP.startswith('/var/tmp'):
|
# FIXME: create 'system tmp dirs' config/var and check tmpdir is in those values to allow for /opt/tmp, etc
|
||||||
|
if tmpdir.startswith('/var/tmp'):
|
||||||
basetmpdir = '/var/tmp'
|
basetmpdir = '/var/tmp'
|
||||||
else:
|
else:
|
||||||
basetmpdir = '/tmp'
|
basetmpdir = '/tmp'
|
||||||
elif tmpdir is None:
|
|
||||||
basetmpdir = C.DEFAULT_REMOTE_TMP
|
|
||||||
else:
|
else:
|
||||||
basetmpdir = tmpdir
|
if tmpdir is None:
|
||||||
|
basetmpdir = C.DEFAULT_REMOTE_TMP
|
||||||
|
else:
|
||||||
|
basetmpdir = tmpdir
|
||||||
|
|
||||||
basetmp = self.join_path(basetmpdir, basefile)
|
basetmp = self.join_path(basetmpdir, basefile)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue