valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Outputters should sync to output, not outputters, on the minion.

Browse Source 
Otherwise, the loader won't pick them up.

Fixes #17103
This commit is contained in:
rallytime 2015-09-28 16:53:53 -06:00
parent ed6207a438
commit 105528720b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ref/file_server/dynamic-modules.rst
View File

@ -23,7 +23,7 @@ The directories are prepended with an underscore:
- :file:`_renderers` - :file:`_renderers`
- :file:`_returners` - :file:`_returners`
- :file:`_states` - :file:`_states`
- :file:`_outputters` - :file:`_output`
- :file:`_utils` - :file:`_utils`
The contents of these directories need to be synced over to the minions after The contents of these directories need to be synced over to the minions after

2
salt/client/ssh/state.py
View File

@ -134,7 +134,7 @@ def prep_trans_tar(file_client, chunks, file_refs, pillar=None):
['salt://_grains'], ['salt://_grains'],
['salt://_renderers'], ['salt://_renderers'],
['salt://_returners'], ['salt://_returners'],
['salt://_outputters'], ['salt://_output'],
['salt://_utils'], ['salt://_utils'],
] ]
with salt.utils.fopen(lowfn, 'w+') as fp_: with salt.utils.fopen(lowfn, 'w+') as fp_:

8
salt/modules/saltutil.py
View File

@ -366,9 +366,9 @@ def sync_returners(saltenv=None, refresh=True):
def sync_outputters(saltenv=None, refresh=True): def sync_outputters(saltenv=None, refresh=True):
''' '''
Sync the outputters from the _outputters directory on the salt master file Sync the outputters from the _output directory on the salt master file
server. This function is environment aware, pass the desired environment server. This function is environment aware, pass the desired environment
to grab the contents of the _outputters directory, base is the default to grab the contents of the _output directory, base is the default
environment. environment.
CLI Example: CLI Example:
@ -377,7 +377,7 @@ def sync_outputters(saltenv=None, refresh=True):
salt '*' saltutil.sync_outputters salt '*' saltutil.sync_outputters
''' '''
ret = _sync('outputters', saltenv) ret = _sync('output', saltenv)
if refresh: if refresh:
refresh_modules() refresh_modules()
return ret return ret
@ -425,7 +425,7 @@ def sync_all(saltenv=None, refresh=True):
ret['grains'] = sync_grains(saltenv, False) ret['grains'] = sync_grains(saltenv, False)
ret['renderers'] = sync_renderers(saltenv, False) ret['renderers'] = sync_renderers(saltenv, False)
ret['returners'] = sync_returners(saltenv, False) ret['returners'] = sync_returners(saltenv, False)
ret['outputters'] = sync_outputters(saltenv, False) ret['output'] = sync_outputters(saltenv, False)
ret['utils'] = sync_utils(saltenv, False) ret['utils'] = sync_utils(saltenv, False)
if refresh: if refresh:
refresh_modules() refresh_modules()