diff --git a/doc/ref/file_server/dynamic-modules.rst b/doc/ref/file_server/dynamic-modules.rst index 07804f2865..4d94d2f817 100644 --- a/doc/ref/file_server/dynamic-modules.rst +++ b/doc/ref/file_server/dynamic-modules.rst @@ -23,7 +23,7 @@ The directories are prepended with an underscore: - :file:`_renderers` - :file:`_returners` - :file:`_states` -- :file:`_outputters` +- :file:`_output` - :file:`_utils` The contents of these directories need to be synced over to the minions after diff --git a/salt/client/ssh/state.py b/salt/client/ssh/state.py index 4a15706632..fe9b7e4dba 100644 --- a/salt/client/ssh/state.py +++ b/salt/client/ssh/state.py @@ -134,7 +134,7 @@ def prep_trans_tar(file_client, chunks, file_refs, pillar=None): ['salt://_grains'], ['salt://_renderers'], ['salt://_returners'], - ['salt://_outputters'], + ['salt://_output'], ['salt://_utils'], ] with salt.utils.fopen(lowfn, 'w+') as fp_: diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py index 58c68f2f93..73928158a1 100644 --- a/salt/modules/saltutil.py +++ b/salt/modules/saltutil.py @@ -366,9 +366,9 @@ def sync_returners(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 - 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. CLI Example: @@ -377,7 +377,7 @@ def sync_outputters(saltenv=None, refresh=True): salt '*' saltutil.sync_outputters ''' - ret = _sync('outputters', saltenv) + ret = _sync('output', saltenv) if refresh: refresh_modules() return ret @@ -425,7 +425,7 @@ def sync_all(saltenv=None, refresh=True): ret['grains'] = sync_grains(saltenv, False) ret['renderers'] = sync_renderers(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) if refresh: refresh_modules()