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:
Brian Coca
2017-07-13 18:31:10 -04:00
committed by Matt Davis
parent 462444b2be
commit 84367eacef
4 changed files with 11 additions and 10 deletions

View File

@@ -241,11 +241,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
use_system_tmp = True
tmp_mode = 0o700
if use_system_tmp:
tmpdir = None
else:
tmpdir = self._remote_expand_user(C.DEFAULT_REMOTE_TMP, sudoable=False)
tmpdir = self._remote_expand_user(self._play_context.remote_tmp_dir, sudoable=False)
cmd = self._connection._shell.mkdtemp(basefile, use_system_tmp, tmp_mode, tmpdir)
result = self._low_level_execute_command(cmd, sudoable=False)

View File

@@ -110,14 +110,16 @@ class ShellBase(object):
# /var/tmp is not).
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'
else:
basetmpdir = '/tmp'
elif tmpdir is None:
basetmpdir = C.DEFAULT_REMOTE_TMP
else:
basetmpdir = tmpdir
if tmpdir is None:
basetmpdir = C.DEFAULT_REMOTE_TMP
else:
basetmpdir = tmpdir
basetmp = self.join_path(basetmpdir, basefile)