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 #16730 from thatch45/wipe_on_rand

Browse Source 
Add -W option to --rand-thin-dir making it easier
This commit is contained in:
Thomas S Hatch 2014-10-17 15:53:41 -06:00
commit 0abcbb437d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,7 @@ class SSH(object):
self.defaults['thin_dir'] = os.path.join(
'/tmp',
'.{0}'.format(uuid.uuid4().hex[:6]))
self.opts['wipe_ssh'] = 'True'
self.serial = salt.payload.Serial(opts)
self.returners = salt.loader.returners(self.opts, {})
self.fsclient = salt.fileclient.FSClient(self.opts)

2
salt/utils/parsers.py
View File

@ -2198,7 +2198,7 @@ class SaltSSHOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
help='Remove the deployment of the salt files when done executing.',
)
self.add_option(
'--rand-thin-dir',
'-W', '--rand-thin-dir',
default=False,
action='store_true',
help=('Select a random temp dir to deploy on the remote system. '