valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16661 from thatch45/fix_rand_thin

Browse Source 
Fix rand_thin dir system, it was broken in the heredoc PR
This commit is contained in:
Thomas S Hatch 2014-10-15 15:35:44 -06:00
commit 03b2b4955c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/client/ssh/__init__.py
View File

@ -16,6 +16,7 @@ import os
import re
import time
import yaml
import uuid
# Import salt libs
import salt.client.ssh.shell
@ -492,6 +493,8 @@ class Single(object):
self.thin_dir = DEFAULT_THIN_DIR.replace('%%USER%%', user)
else:
self.thin_dir = DEFAULT_THIN_DIR.replace('%%USER%%', 'root')
if self.opts.get('rand_thin_dir'):
self.thin_dir = os.path.join('/tmp', '.{0}'.format(uuid.uuid4().hex))
self.opts['_thin_dir'] = self.thin_dir
self.fsclient = fsclient
self.context = {'master_opts': self.opts,