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

Update Carbon versionadded tags to 2016.11.0 in runners/*

Browse Source
This commit is contained in:
rallytime 2016-10-27 10:40:01 -06:00
parent ec8bb4d54d
commit 85d2145fe6
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/runners/auth.py
View File

@ -2,7 +2,7 @@
''' '''
Authentication runner for creating, deleting, and managing eauth tokens. Authentication runner for creating, deleting, and managing eauth tokens.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
''' '''

4
salt/runners/event.py
View File

@ -2,7 +2,7 @@
''' '''
Module for sending events using the runner system. Module for sending events using the runner system.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
''' '''
from __future__ import absolute_import from __future__ import absolute_import
@ -18,8 +18,6 @@ def send(tag, data=None):
''' '''
Send an event with the given tag and data. Send an event with the given tag and data.
.. versionadded:: Carbon
This is useful for sending events directly to the master from the shell This is useful for sending events directly to the master from the shell
with salt-run. It is also quite useful for sending events in orchestration with salt-run. It is also quite useful for sending events in orchestration
states where the ``fire_event`` requisite isn't sufficient because it does states where the ``fire_event`` requisite isn't sufficient because it does

2
salt/runners/fileserver.py
View File

@ -41,7 +41,7 @@ def envs(backend=None, sources=False):
def clear_file_list_cache(saltenv=None, backend=None): def clear_file_list_cache(saltenv=None, backend=None):
''' '''
.. versionadded:: Carbon .. versionadded:: 2016.11.0
The Salt fileserver caches the files/directories/symlinks for each The Salt fileserver caches the files/directories/symlinks for each
fileserver backend and environment as they are requested. This is done to fileserver backend and environment as they are requested. This is done to

22
salt/runners/manage.py
View File

@ -658,17 +658,17 @@ def bootstrap(version='develop',
hosts need to exist in the specified roster. hosts need to exist in the specified roster.
root_user : False root_user : False
Prepend ``root@`` to each host. Default changed in Salt Carbon from ``True`` Prepend ``root@`` to each host. Default changed in Salt 2016.11.0 from ``True``
to ``False``. to ``False``.
.. versionchanged:: Carbon .. versionchanged:: 2016.11.0
.. deprecated:: Carbon .. deprecated:: 2016.11.0
script_args script_args
Any additional arguments that you want to pass to the script. Any additional arguments that you want to pass to the script.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
roster : flat roster : flat
The roster to use for Salt SSH. More information about roster files can The roster to use for Salt SSH. More information about roster files can
@ -677,41 +677,41 @@ def bootstrap(version='develop',
A full list of roster types, see the :ref:`builtin roster modules <all-salt.roster>` A full list of roster types, see the :ref:`builtin roster modules <all-salt.roster>`
documentation. documentation.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
ssh_user ssh_user
If ``user`` isn't found in the ``roster``, a default SSH user can be set here. If ``user`` isn't found in the ``roster``, a default SSH user can be set here.
Keep in mind that ``ssh_user`` will not override the roster ``user`` value if Keep in mind that ``ssh_user`` will not override the roster ``user`` value if
it is already defined. it is already defined.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
ssh_password ssh_password
If ``passwd`` isn't found in the ``roster``, a default SSH password can be set If ``passwd`` isn't found in the ``roster``, a default SSH password can be set
here. Keep in mind that ``ssh_password`` will not override the roster ``passwd`` here. Keep in mind that ``ssh_password`` will not override the roster ``passwd``
value if it is already defined. value if it is already defined.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
ssh_privkey ssh_privkey
If ``priv`` isn't found in the ``roster``, a default SSH private key can be set If ``priv`` isn't found in the ``roster``, a default SSH private key can be set
here. Keep in mind that ``ssh_password`` will not override the roster ``passwd`` here. Keep in mind that ``ssh_password`` will not override the roster ``passwd``
value if it is already defined. value if it is already defined.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
tmp_dir : /tmp/.bootstrap tmp_dir : /tmp/.bootstrap
The temporary directory to download the bootstrap script in. This The temporary directory to download the bootstrap script in. This
directory will have ``-<uuid4>`` appended to it. For example: directory will have ``-<uuid4>`` appended to it. For example:
``/tmp/.bootstrap-a19a728e-d40a-4801-aba9-d00655c143a7/`` ``/tmp/.bootstrap-a19a728e-d40a-4801-aba9-d00655c143a7/``
.. versionadded:: Carbon .. versionadded:: 2016.11.0
http_backend : tornado http_backend : tornado
The backend library to use to download the script. If you need to use The backend library to use to download the script. If you need to use
a ``file:///`` URL, then you should set this to ``urllib2``. a ``file:///`` URL, then you should set this to ``urllib2``.
.. versionadded:: Carbon .. versionadded:: 2016.11.0
CLI Example: CLI Example:
@ -727,7 +727,7 @@ def bootstrap(version='develop',
''' '''
dep_warning = ( dep_warning = (
'Starting with Salt Carbon, manage.bootstrap now uses Salt SSH to ' 'Starting with Salt 2016.11.0, manage.bootstrap now uses Salt SSH to '
'connect, and requires a roster entry. Please ensure that a roster ' 'connect, and requires a roster entry. Please ensure that a roster '
'entry exists for this host. Non-roster hosts will no longer be ' 'entry exists for this host. Non-roster hosts will no longer be '
'supported starting with Salt Oxygen.' 'supported starting with Salt Oxygen.'

2
salt/runners/salt.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
''' '''
.. versionadded:: Carbon .. versionadded:: 2016.11.0
This runner makes Salt's This runner makes Salt's
execution modules available execution modules available

2
salt/runners/saltutil.py
View File

@ -253,7 +253,7 @@ def sync_pillar(saltenv='base'):
def sync_utils(saltenv='base'): def sync_utils(saltenv='base'):
''' '''
.. versionadded:: Carbon .. versionadded:: 2016.11.0
Sync utils modules from ``salt://_utils`` to the master Sync utils modules from ``salt://_utils`` to the master