add module_dirs to salt ssh thin tarball

Fixes #45535
This commit is contained in:
Daniel Wallace 2018-03-02 14:15:48 -07:00
parent 10a47dcbc4
commit 749ae580ed
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
2 changed files with 2 additions and 0 deletions

View file

@ -914,6 +914,7 @@ class Single(object):
opts_pkg['pillar_roots'] = self.opts['pillar_roots']
opts_pkg['ext_pillar'] = self.opts['ext_pillar']
opts_pkg['extension_modules'] = self.opts['extension_modules']
opts_pkg['module_dirs'] = self.opts['module_dirs']
opts_pkg['_ssh_version'] = self.opts['_ssh_version']
opts_pkg['__master_opts__'] = self.context['master_opts']
if '_caller_cachedir' in self.opts:

View file

@ -1486,6 +1486,7 @@ DEFAULT_MASTER_OPTS = {
'keep_acl_in_token': False,
'eauth_acl_module': '',
'extension_modules': os.path.join(salt.syspaths.CACHE_DIR, 'master', 'extmods'),
'module_dirs': [],
'file_recv': False,
'file_recv_max_size': 100,
'file_buffer_size': 1048576,