saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update neon reference

Browse source
This commit is contained in:
Frode Gundersen 2020-01-15 18:25:22 +00:00
parent 648b90b292
commit ba38ff7074
No known key found for this signature in database
GPG key ID: DE4D7B2EC3F416F5
53 changed files with 119 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/configuration/master.rst
View file

@ -4266,7 +4266,7 @@ explanation <git-pillar-multiple-remotes>` from the git_pillar documentation.
``git_pillar_update_interval``
******************************
.. versionadded:: neon
.. versionadded:: 3000
Default: ``60``

4
doc/ref/configuration/minion.rst
View file

@ -657,7 +657,7 @@ FQDN (for instance, Solaris).
``minion_id_remove_domain``
---------------------------
.. versionadded:: Neon
.. versionadded:: 3000
Default: ``False``
@ -813,7 +813,7 @@ matches, and regular expressions are supported.
Some states and execution modules depend on grains. Filtering may cause
them to be unavailable or run unreliably.
.. versionadded:: Neon
.. versionadded:: 3000
.. code-block:: yaml

4
doc/ref/states/requisites.rst
View file

@ -938,7 +938,7 @@ For example:
In the above case, ``some_check`` will be run prior to _each_ name -- once for
``first_deploy_cmd`` and a second time for ``second_deploy_cmd``.
.. versionchanged:: Neon
.. versionchanged:: 3000
The ``unless`` requisite can take a module as a dictionary field in unless.
The dictionary must contain an argument ``fun`` which is the module that is
being run, and everything else must be passed in under the args key or will
@ -1006,7 +1006,7 @@ concept of ``True`` and ``False``.
The above example ensures that the stop_volume and delete modules only run
if the gluster commands return a 0 ret value.
.. versionchanged:: Neon
.. versionchanged:: 3000
The ``onlyif`` requisite can take a module as a dictionary field in onlyif.
The dictionary must contain an argument ``fun`` which is the module that is
being run, and everything else must be passed in under the args key or will

2
doc/topics/development/contributing.rst
View file

@ -55,7 +55,7 @@ will be notified about style and lint issues before you ever open a PR.
Salt Coding Style
-----------------
After the Neon release, SaltStack is `joining the ranks <SEP 15_>`_ of projects
After the 3000 release, SaltStack is `joining the ranks <SEP 15_>`_ of projects
in adopting the `Black code formatter <Black_>`_ in order to ease the adoption
of a unified code formatting style.

2
doc/topics/engines/index.rst
View file

@ -27,7 +27,7 @@ Salt engines are configured under an ``engines`` top-level section in your Salt
port: 5959
proto: tcp
.. versionadded:: Neon
.. versionadded:: 3000
Multiple copies of a particular Salt engine can be configured by including the ``engine_module`` parameter in the engine configuration.

14
doc/topics/jinja/index.rst
View file

@ -1024,7 +1024,7 @@ Returns:
``set_dict_key_value``
----------------------
..versionadded:: Neon
..versionadded:: 3000
Allows you to set a value in a nested dictionary without having to worry if all the nested keys actually exist.
Missing keys will be automatically created if they do not exist.
@ -1057,7 +1057,7 @@ Example 2:
``append_dict_key_value``
-------------------------
..versionadded:: Neon
..versionadded:: 3000
Allows you to append to a list nested (deep) in a dictionary without having to worry if all the nested keys (or the list itself) actually exist.
Missing keys will automatically be created if they do not exist.
@ -1091,7 +1091,7 @@ Example 2:
``extend_dict_key_value``
-------------------------
..versionadded:: Neon
..versionadded:: 3000
Allows you to extend a list nested (deep) in a dictionary without having to worry if all the nested keys (or the list itself) actually exist.
Missing keys will automatically be created if they do not exist.
@ -1124,7 +1124,7 @@ Example 2:
``update_dict_key_value``
-------------------------
..versionadded:: Neon
..versionadded:: 3000
Allows you to update a dictionary nested (deep) in another dictionary without having to worry if all the nested keys actually exist.
Missing keys will automatically be created if they do not exist.
@ -1349,7 +1349,7 @@ Returns:
``json_query``
--------------
.. versionadded:: Neon
.. versionadded:: 3000
A port of Ansible ``json_query`` Jinja filter to make queries against JSON data using `JMESPath language`_.
Could be used to filter ``pillar`` data, ``yaml`` maps, and together with :jinja_ref:`http_query`.
@ -1395,7 +1395,7 @@ Returns:
``to_snake_case``
-----------------
.. versionadded:: Neon
.. versionadded:: 3000
Converts a string from camelCase (or CamelCase) to snake_case.
@ -1415,7 +1415,7 @@ Returns:
``to_camelcase``
----------------
.. versionadded:: Neon
.. versionadded:: 3000
Converts a string from snake_case to camelCase (or UpperCamelCase if so indicated).

6
doc/topics/matchers/index.rst
View file

@ -4,10 +4,10 @@
Matchers
========
.. versionadded:: Neon
.. versionadded:: 3000
Matchers are modules that provide Salt's targeting abilities. As of the
Neon release, matchers can be dynamically loaded. Currently new matchers
3000 release, matchers can be dynamically loaded. Currently new matchers
cannot be created because the required plumbing for the CLI does not exist yet.
Existing matchers may have their functionality altered or extended.
@ -22,7 +22,7 @@ take a ``delimiter`` argument and should default to ``DEFAULT_TARGET_DELIM``.
Like other Salt loadable modules, modules that override built-in functionality
can be placed in ``file_roots`` in a special directory and then copied to the
minion through the normal sync process. :py:func:`saltutil.sync_all <salt.modules.saltutil.sync_all>`
will transfer all loadable modules, and the Neon release introduces
will transfer all loadable modules, and the 3000 release introduces
:py:func:`saltutil.sync_matchers <salt.modules.saltutil.sync_matchers>`. For matchers, the directory is
``/srv/salt/_matchers`` (assuming your ``file_roots`` is set to the default
``/srv/salt``).

4
doc/topics/releases/2016.11.9.rst
View file

@ -1297,14 +1297,14 @@ Changelog for v2016.11.8..v2016.11.9
* **ISSUE** `#43223`_: (`rallytime`_) Properly deprecate describe_route_table function in boto_vpc module (refs: `#43445`_)
* **PR** `#43456`_: (`rallytime`_) Add Neon to version list
* **PR** `#43456`_: (`rallytime`_) Add 3000 to version list
@ *2017-09-12 15:00:27 UTC*
* **PR** `#43445`_: (`rallytime`_) Bump deprecation warning for boto_vpc.describe_route_table (refs: `#43456`_)
* 3c429299f9 Merge pull request `#43456`_ from rallytime/43445_follow_up
* 35c1d8898d Add Neon to version list
* 35c1d8898d Add 3000 to version list
* **PR** `#43441`_: (`meaksh`_) Use $HOME to get the user home directory instead using '~' char
@ *2017-09-11 21:25:20 UTC*

2
doc/topics/releases/2017.7.3.rst
View file

@ -3938,7 +3938,7 @@ Changelog for v2017.7.2..v2017.7.3
* 3c429299f9 Merge pull request `#43456`_ from rallytime/43445_follow_up
* 35c1d8898d Add Neon to version list
* 35c1d8898d Add 3000 to version list
* 6db7a721c0 Merge pull request `#43441`_ from meaksh/2016.11-salt-bash-completion-fix

10
doc/topics/releases/2018.3.0.rst
View file

@ -197,7 +197,7 @@ Several Jinja Filters Renamed
The following Jinja filters (originally added in 2017.7.0) have been renamed
due to the fact that they were inaccurately named when initially added. The
original names will be supported until the Neon release of Salt.
original names will be supported until the 3000 release of Salt.
- :jinja_ref:`rand_str` renamed to :jinja_ref:`random_hash`
- :jinja_ref:`jinja_decode_dict` renamed to :jinja_ref:`jinja_encode_dict`
@ -1624,7 +1624,7 @@ NaCL Module and Runner changes
==============================
In addition to argument changes in both the NaCL module and runner for future
removal in the Neon release, the default "box_type" has changed from
removal in the 3000 release, the default "box_type" has changed from
``secretbox`` to ``sealedbox``. SecretBox is data encrypted using private key
``sk`` and Sealedbox is encrypted using public key ``pk``.
@ -1634,7 +1634,7 @@ removal in the Neon release, the default "box_type" has changed from
The Salt utility functions from ``salt.utils`` (typically used by those
developing extension modules for Salt) have been moved into different modules,
grouped logically based on their functionality. The old function names will
continue to work until the ``Neon`` release of Salt (due around Q1 2019).
continue to work until the ``3000`` release of Salt (due around Q1 2019).
The renamed functions are:
@ -1919,7 +1919,7 @@ Grain Deprecations
------------------
- For ``smartos``, some grains have been deprecated. These grains will be
removed in Neon:
removed in 3000:
- The ``hypervisor_uuid`` grain has been replaced with
``mdata:sdc:server_uuid``
@ -1974,5 +1974,5 @@ RAET transport
We haven't been doing development on RAET for quite some time and decided that
2018.3.0 is the time to announce the deprecation. RAET support will be removed
in Neon. Please consider to move to ``zeromq`` or ``tcp`` transport instead of
in 3000. Please consider to move to ``zeromq`` or ``tcp`` transport instead of
``raet``.

6
doc/topics/releases/2018.3.1.rst
View file

@ -2123,7 +2123,7 @@ Changelog for v2018.3.0..v2018.3.1
* 5fcda3eff8 Merge branch '2018.3' into testing_jinja_filters_avaiable_via_salt_ssh
* 0adfee9b11 Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non-iterables are passed. Adding warning about lst_avg results being wrong and future updates in Neon.
* 0adfee9b11 Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non-iterables are passed. Adding warning about lst_avg results being wrong and future updates in 3000.
* f3f42146ca Removing expected from strftime and hashsum tests since the results are always different and we are only concerned about the filter being available.
@ -2897,14 +2897,14 @@ Changelog for v2018.3.0..v2018.3.1
* **ISSUE** `#46334`_: (`sjorge`_) [2018.3.0rc1] Stacktrace on call to nacl.dec (refs: `#46426`_)
* **PR** `#46720`_: (`rallytime`_) Bump deprecation notices in nacl module & runner to Neon
* **PR** `#46720`_: (`rallytime`_) Bump deprecation notices in nacl module & runner to 3000
@ *2018-03-27 21:15:46 UTC*
* **PR** `#46426`_: (`garethgreenaway`_) [2018.3.0rc1] fixes to nacl module & runner (refs: `#46639`_, `#46720`_)
* 65bb37effd Merge pull request `#46720`_ from rallytime/bump-nacl-deprecation
* 5102c0310c Bump deprecation notices in nacl module & runner to Neon
* 5102c0310c Bump deprecation notices in nacl module & runner to 3000
* **PR** `#46733`_: (`rallytime`_) [2018.3] Merge forward from 2018.3.0rc1 to 2018.3
@ *2018-03-27 18:46:43 UTC*

4
doc/topics/releases/2018.3.3.rst
View file

@ -1296,12 +1296,12 @@ Changelog for v2018.3.2..v2018.3.3
* fb7885315c Wrap ElementTree.tostring to make strs, not bytes
* **PR** `#48824`_: (`rallytime`_) Bump deprecation in win_servermanager state to Neon
* **PR** `#48824`_: (`rallytime`_) Bump deprecation in win_servermanager state to 3000
@ *2018-08-02 18:01:34 UTC*
* 1fb7d9431b Merge pull request `#48824`_ from rallytime/win_servermanager_deprecations
* 6ef5412528 Bump deprecation in win_servermanager state to Neon
* 6ef5412528 Bump deprecation in win_servermanager state to 3000
* **ISSUE** `#37512`_: (`ChristianBeer`_) What's the precedence if multiple master configurations are specified? (refs: `#48888`_)

2
doc/topics/releases/2019.2.0.rst
View file

@ -77,7 +77,7 @@ This test case has also been tested with the ``yaml`` and ``json`` filters succe
The :jinja_ref:`json_encode_dict` and :jinja_ref:`json_encode_list` filters
do not actually dump the results to JSON. Since ``tojson`` accomplishes
what those filters were designed to do, they are now deprecated and will be
removed in the Neon release. The ``tojson`` filter should be used in all
removed in the 3000 release. The ``tojson`` filter should be used in all
cases where :jinja_ref:`json_encode_dict` and :jinja_ref:`json_encode_list`
would have been used.

7
doc/topics/releases/neon.rst → doc/topics/releases/3000.rst
View file

@ -1,8 +1,9 @@
:orphan:
.. _release-3000:
==================================
Salt Release Notes - Codename Neon
==================================
=======================================
Salt 3000 Release Notes - Codename Neon
=======================================
Saltcheck Updates
=================

1
doc/topics/releases/index.rst
View file

@ -20,6 +20,7 @@ Previous Releases
:maxdepth: 1
:glob:
3000.*
2019.2.*
2018.3.*
2017.7.*

2
doc/topics/releases/version_numbers.rst
View file

@ -36,7 +36,7 @@ Assigned codenames:
- Nitrogen: ``2017.7.0``
- Oxygen: ``2018.3.0``
- Fluorine: ``2019.2.0``
- Neon: ``TBD``
- Neon: ``3000``
- Sodium: ``TBD``
Example

4
doc/topics/slots/index.rst
View file

@ -5,7 +5,7 @@ Slots
=====
.. versionadded:: 2018.3.0
.. versionchanged:: Neon
.. versionchanged:: 3000
.. note:: This functionality is under development and could be changed in the
future releases
@ -34,7 +34,7 @@ Slot syntax looks close to the simple python function call.
__slot__:salt:<module>.<function>(<args>, ..., <kwargs...>, ...)
For the Neon release, this syntax has been updated to support parsing functions
For the 3000 release, this syntax has been updated to support parsing functions
which return dictionaries and for appending text to the slot result.
.. code-block:: text

4
salt/cloud/deploy/bootstrap-salt.sh
View file

@ -1295,7 +1295,7 @@ __gather_system_info() {
#----------------------------------------------------------------------------------------------------------------------
# shellcheck disable=SC2034
__ubuntu_derivatives_translation() {
UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os|neon)"
UBUNTU_DERIVATIVES="(trisquel|linuxmint|linaro|elementary_os|3000)"
# Mappings
trisquel_6_ubuntu_base="12.04"
linuxmint_13_ubuntu_base="12.04"
@ -1304,7 +1304,7 @@ __ubuntu_derivatives_translation() {
linuxmint_19_ubuntu_base="18.04"
linaro_12_ubuntu_base="12.04"
elementary_os_02_ubuntu_base="12.04"
neon_16_ubuntu_base="16.04"
3000_16_ubuntu_base="16.04"
# Translate Ubuntu derivatives to their base Ubuntu version
match=$(echo "$DISTRO_NAME_L" | grep -E ${UBUNTU_DERIVATIVES})

2
salt/engines/fluent.py
View file

@ -3,7 +3,7 @@
An engine that reads messages from the salt event bus and pushes
them onto a fluent endpoint.
.. versionadded:: neon
.. versionadded:: 3000
:Configuration:

6
salt/grains/core.py
View file

@ -1440,7 +1440,7 @@ _OS_NAME_MAP = {
'void': 'Void',
'slesexpand': 'RES',
'linuxmint': 'Mint',
'neon': 'KDE neon',
'3000': 'KDE 3000',
}
# Map the 'os' grain to the 'os_family' grain
@ -1503,11 +1503,11 @@ _OS_FAMILY_MAP = {
'Devuan': 'Debian',
'antiX': 'Debian',
'Kali': 'Debian',
'neon': 'Debian',
'3000': 'Debian',
'Cumulus': 'Debian',
'Deepin': 'Debian',
'NILinuxRT': 'NILinuxRT',
'KDE neon': 'Debian',
'KDE 3000': 'Debian',
'Void': 'Void',
'IDMS': 'Debian',
'Funtoo': 'Gentoo',

8
salt/modules/aptpkg.py
View file

@ -1666,7 +1666,7 @@ def get_repo(repo, **kwargs):
ppa_auth = kwargs.get('ppa_auth', None)
# we have to be clever about this since the repo definition formats
# are a bit more "loose" than in some other distributions
if repo.startswith('ppa:') and __grains__['os'] in ('Ubuntu', 'Mint', 'neon'):
if repo.startswith('ppa:') and __grains__['os'] in ('Ubuntu', 'Mint', '3000'):
# This is a PPA definition meaning special handling is needed
# to derive the name.
dist = __grains__['lsb_distrib_codename']
@ -1744,7 +1744,7 @@ def del_repo(repo, **kwargs):
'''
_check_apt()
is_ppa = False
if repo.startswith('ppa:') and __grains__['os'] in ('Ubuntu', 'Mint', 'neon'):
if repo.startswith('ppa:') and __grains__['os'] in ('Ubuntu', 'Mint', '3000'):
# This is a PPA definition meaning special handling is needed
# to derive the name.
is_ppa = True
@ -2127,7 +2127,7 @@ def mod_repo(repo, saltenv='base', **kwargs):
# to ensure no one sets some key values that _shouldn't_ be changed on the
# object itself, this is just a white-list of "ok" to set properties
if repo.startswith('ppa:'):
if __grains__['os'] in ('Ubuntu', 'Mint', 'neon'):
if __grains__['os'] in ('Ubuntu', 'Mint', '3000'):
# secure PPAs cannot be supported as of the time of this code
# implementation via apt-add-repository. The code path for
# secure PPAs should be the same as urllib method
@ -2439,7 +2439,7 @@ def expand_repo_def(**kwargs):
sanitized = {}
repo = salt.utils.pkg.deb.strip_uri(kwargs['repo'])
if repo.startswith('ppa:') and __grains__['os'] in ('Ubuntu', 'Mint', 'neon'):
if repo.startswith('ppa:') and __grains__['os'] in ('Ubuntu', 'Mint', '3000'):
dist = __grains__['lsb_distrib_codename']
owner_name, ppa_name = repo[4:].split('/', 1)
if 'ppa_auth' in kwargs:

6
salt/modules/boto_ssm.py
View file

@ -38,7 +38,7 @@ def get_parameter(name, withdecryption=False, resp_json=False, region=None, key=
'''
Retrives a parameter from SSM Parameter Store
.. versionadded:: Neon
.. versionadded:: 3000
.. code-block:: text
@ -71,7 +71,7 @@ def put_parameter(Name,
'''
Sets a parameter in the SSM parameter store
.. versionadded:: Neon
.. versionadded:: 3000
.. code-block:: text
@ -104,7 +104,7 @@ def delete_parameter(Name, region=None, key=None, keyid=None, profile=None):
'''
Removes a parameter from the SSM parameter store
.. versionadded:: Neon
.. versionadded:: 3000
.. code-block:: text
salt-call boto_ssm.delete_parameter test-param

4
salt/modules/config.py
View file

@ -176,7 +176,7 @@ def option(
Shorthand to omit all of the above and return matches only from the
"sane defaults".
.. versionadded:: Neon
.. versionadded:: 3000
wildcard : False
If used, this will perform pattern matching on keys. Note that this
@ -189,7 +189,7 @@ def option(
{'foo.bar': True, 'foo.baz': False}
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:

2
salt/modules/djangomod.py
View file

@ -129,7 +129,7 @@ def migrate(settings_module,
Execute the Django-Admin migrate command (requires Django 1.7 or higher).
.. versionadded:: Neon
.. versionadded:: 3000
settings_module
Specifies the settings module to use.

4
salt/modules/dockermod.py
View file

@ -59,7 +59,7 @@ any of the following locations:
in Minion config file in order to work)
.. important::
Versions prior to Neon require that Docker credentials are configured in
Versions prior to 3000 require that Docker credentials are configured in
Pillar data. Be advised that Pillar data is still recommended though,
because this keeps the configuration from being stored on the Minion.
@ -1054,7 +1054,7 @@ def compare_container_networks(first, second):
than waiting for a new Salt release one can just set
:conf_minion:`docker.compare_container_networks`.
.. versionchanged:: Neon
.. versionchanged:: 3000
This config option can now also be set in pillar data and grains.
Additionally, it can be set in the master config file, provided that
:conf_minion:`pillar_opts` is enabled on the minion.

10
salt/modules/elasticsearch.py
View file

@ -267,7 +267,7 @@ def cluster_stats(nodes=None, hosts=None, profile=None):
def cluster_get_settings(flat_settings=False, include_defaults=False, hosts=None, profile=None):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Return Elasticsearch cluster settings.
@ -291,7 +291,7 @@ def cluster_get_settings(flat_settings=False, include_defaults=False, hosts=None
def cluster_put_settings(body=None, flat_settings=False, hosts=None, profile=None):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Set Elasticsearch cluster settings.
@ -693,7 +693,7 @@ def index_close(index, allow_no_indices=True, expand_wildcards='open', ignore_un
def index_get_settings(hosts=None, profile=None, **kwargs):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Check for the existence of an index and if it exists, return its settings
http://www.elastic.co/guide/en/elasticsearch/reference/current/indices-get-settings.html
@ -742,7 +742,7 @@ def index_get_settings(hosts=None, profile=None, **kwargs):
def index_put_settings(body=None, hosts=None, profile=None, source=None, **kwargs):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Update existing index settings
https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
@ -1383,7 +1383,7 @@ def snapshot_delete(repository, snapshot, hosts=None, profile=None):
def flush_synced(hosts=None, profile=None, **kwargs):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Perform a normal flush, then add a generated unique marker (sync_id) to all shards.
http://www.elastic.co/guide/en/elasticsearch/reference/current/indices-synced-flush.html

2
salt/modules/file.py
View file

@ -3776,7 +3776,7 @@ def remove(path):
salt '*' file.remove /tmp/foo
.. versionchanged:: Neon
.. versionchanged:: 3000
The method now works on all types of file system entries, not just
files, directories and symlinks.
'''

2
salt/modules/freezer.py
View file

@ -242,7 +242,7 @@ def restore(name=None, clean=False, **kwargs):
clean
If True remove the frozen information YAML from the cache
.. version-added:: Neon
.. version-added:: 3000
CLI Example:

4
salt/modules/git.py
View file

@ -3056,7 +3056,7 @@ def merge(cwd,
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html#AUTHORIZED_KEYS_FILE_FORMAT
.. versionadded:: 2018.3.5,2019.2.1,Neon
.. versionadded:: 2018.3.5,2019.2.1,3000
ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command
@ -4245,7 +4245,7 @@ def reset(cwd,
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html#AUTHORIZED_KEYS_FILE_FORMAT
.. versionadded:: 2018.3.5,2019.2.1,Neon
.. versionadded:: 2018.3.5,2019.2.1,3000
ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command

4
salt/modules/hashutil.py
View file

@ -121,7 +121,7 @@ def base64_encodestring(instr):
a newline ('\\n') character after every 76 characters and always
at the end of the encoded byte-like object.
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:
@ -169,7 +169,7 @@ def base64_decodestring(instr):
'''
Decode a base64-encoded byte-like object using the "modern" Python interface
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:

4
salt/modules/heat.py
View file

@ -475,7 +475,7 @@ def create_stack(name=None, template_file=None, environment=None,
.. versionadded:: 2017.7.5,2018.3.1
The spelling mistake in parameter `enviroment` was corrected to `environment`.
The `enviroment` spelling mistake has been removed in Salt Neon.
The `enviroment` spelling mistake has been removed in Salt 3000.
'''
h_client = _auth(profile)
@ -669,7 +669,7 @@ def update_stack(name=None, template_file=None, environment=None,
.. versionadded:: 2017.7.5,2018.3.1
The spelling mistake in parameter `enviroment` was corrected to `environment`.
The `enviroment` spelling mistake has been removed in Salt Neon.
The `enviroment` spelling mistake has been removed in Salt 3000.
'''
h_client = _auth(profile)

2
salt/modules/jinja.py
View file

@ -3,7 +3,7 @@
Module for checking jinja maps and verifying the result of loading JSON/YAML
files
.. versionadded:: Neon
.. versionadded:: 3000
'''
from __future__ import absolute_import, print_function, unicode_literals

8
salt/modules/rabbitmq.py
View file

@ -269,7 +269,7 @@ def list_upstreams(runas=None):
salt '*' rabbitmq.list_upstreams
.. versionadded:: Neon
.. versionadded:: 3000
'''
if runas is None and not salt.utils.platform.is_windows():
runas = salt.utils.user.get_user()
@ -329,7 +329,7 @@ def upstream_exists(name, runas=None):
salt '*' rabbitmq.upstream_exists rabbit_upstream
.. versionadded:: Neon
.. versionadded:: 3000
'''
if runas is None and not salt.utils.platform.is_windows():
runas = salt.utils.user.get_user()
@ -1223,7 +1223,7 @@ def set_upstream(
salt '*' rabbitmq.set_upstream upstream_name ack_mode=on-confirm max_hops=1 \
trust_user_id=True uri=amqp://hostname
.. versionadded:: Neon
.. versionadded:: 3000
'''
if runas is None and not salt.utils.platform.is_windows():
runas = salt.utils.user.get_user()
@ -1262,7 +1262,7 @@ def delete_upstream(name, runas=None):
salt '*' rabbitmq.delete_upstream upstream_name
.. versionadded:: Neon
.. versionadded:: 3000
'''
if runas is None and not salt.utils.platform.is_windows():
runas = salt.utils.user.get_user()

2
salt/modules/salt_version.py
View file

@ -2,7 +2,7 @@
'''
Access Salt's elemental release code-names.
.. versionadded:: Neon
.. versionadded:: 3000
Salt's feature release schedule is based on the Periodic Table, as described
in the :ref:`Version Numbers <version-numbers>` documentation.

4
salt/modules/saltcheck.py
View file

@ -20,7 +20,7 @@ folder, and should be named the same as the associated state. The ``id`` of a te
same manner as in salt state files and should be unique and descriptive.
.. versionadded:: Neon
.. versionadded:: 3000
The ``saltcheck-tests`` folder can be customized using the ``saltcheck_test_location`` minion
configuration setting. This setting is a relative path from the formula's ``salt://`` path
to the test files.
@ -375,7 +375,7 @@ def report_highstate_tests(saltenv=None):
salt '*' saltcheck.report_highstate_tests
.. versionadded:: Neon
.. versionadded:: 3000
'''
if not saltenv:
if 'saltenv' in __opts__ and __opts__['saltenv']:

2
salt/modules/saltutil.py
View file

@ -922,7 +922,7 @@ def sync_pillar(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blackl
def sync_executors(saltenv=None, refresh=True, extmod_whitelist=None, extmod_blacklist=None):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Sync executors from ``salt://_executors`` to the minion

28
salt/modules/virt.py
View file

@ -1351,7 +1351,7 @@ def init(name,
'cmdline': 'console=ttyS0 ks=http://example.com/f8-i386/os/'
}
.. versionadded:: neon
.. versionadded:: 3000
.. _init-nic-def:
@ -1833,7 +1833,7 @@ def update(name,
'cmdline': 'console=ttyS0 ks=http://example.com/f8-i386/os/'
}
.. versionadded:: neon
.. versionadded:: 3000
:return:
@ -4429,7 +4429,7 @@ def network_define(name,
a possible DHCP configuration. The structure is documented
in net-define-ip_.
..versionadded:: Neon
..versionadded:: 3000
:type ipv4_config: dict or None
:param ipv6_config: IP v6 configuration
@ -4437,7 +4437,7 @@ def network_define(name,
a possible DHCP configuration. The structure is documented
in net-define-ip_.
..versionadded:: Neon
..versionadded:: 3000
:type ipv6_config: dict or None
:param connection: libvirt connection URI, overriding defaults
@ -4593,7 +4593,7 @@ def network_get_xml(name, **kwargs):
:param username: username to connect with, overriding defaults
:param password: password to connect with, overriding defaults
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:
@ -4751,7 +4751,7 @@ def pool_capabilities(**kwargs):
:param username: username to connect with, overriding defaults
:param password: password to connect with, overriding defaults
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:
@ -4909,7 +4909,7 @@ def pool_define(name,
:param source_initiator:
Initiator IQN for libiscsi-direct pool types. (Default: ``None``)
.. versionadded:: neon
.. versionadded:: 3000
:param source_adapter:
SCSI source definition. The value is a dictionary with ``type``, ``name``, ``parent``,
``managed``, ``parent_wwnn``, ``parent_wwpn``, ``parent_fabric_wwn``, ``wwnn``, ``wwpn``
@ -4956,7 +4956,7 @@ def pool_define(name,
}
}
Since neon, instead the source authentication can only contain ``username``
Since 3000, instead the source authentication can only contain ``username``
and ``password`` properties. In this case the libvirt secret will be defined and used.
For Ceph authentications a base64 encoded key is expected.
@ -5129,7 +5129,7 @@ def pool_update(name,
:param source_initiator:
Initiator IQN for libiscsi-direct pool types. (Default: ``None``)
.. versionadded:: neon
.. versionadded:: 3000
:param source_adapter:
SCSI source definition. The value is a dictionary with ``type``, ``name``, ``parent``,
``managed``, ``parent_wwnn``, ``parent_wwpn``, ``parent_fabric_wwn``, ``wwnn``, ``wwpn``
@ -5176,7 +5176,7 @@ def pool_update(name,
}
}
Since neon, instead the source authentication can only contain ``username``
Since 3000, instead the source authentication can only contain ``username``
and ``password`` properties. In this case the libvirt secret will be defined and used.
For Ceph authentications a base64 encoded key is expected.
@ -5207,7 +5207,7 @@ def pool_update(name,
salt '*' virt.pool_update myshare netfs source_format=cifs \
source_dir=samba_share source_hosts="['example.com']" target=/mnt/cifs
.. versionadded:: neon
.. versionadded:: 3000
'''
# Get the current definition to compare the two
conn = __get_conn(**kwargs)
@ -5361,7 +5361,7 @@ def pool_get_xml(name, **kwargs):
:param username: username to connect with, overriding defaults
:param password: password to connect with, overriding defaults
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:
@ -5636,7 +5636,7 @@ def volume_infos(pool=None, volume=None, **kwargs):
:param username: username to connect with, overriding defaults
:param password: password to connect with, overriding defaults
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:
@ -5708,7 +5708,7 @@ def volume_delete(pool, volume, **kwargs):
:param username: username to connect with, overriding defaults
:param password: password to connect with, overriding defaults
.. versionadded:: Neon
.. versionadded:: 3000
CLI Example:

2
salt/modules/x509.py
View file

@ -1391,7 +1391,7 @@ def create_certificate(
for ignore in list(_STATE_INTERNAL_KEYWORDS) + \
['listen_in', 'prerequired', '__prerequired__']:
kwargs.pop(ignore, None)
# TODO: Make timeout configurable in Neon
# TODO: Make timeout configurable in 3000
certs = __salt__['publish.publish'](
tgt=ca_server,
fun='x509.sign_remote_certificate',

2
salt/modules/xml.py
View file

@ -2,7 +2,7 @@
'''
XML file manager
.. versionadded:: Neon
.. versionadded:: 3000
'''
from __future__ import absolute_import, print_function, unicode_literals

2
salt/pillar/git_pillar.py
View file

@ -355,7 +355,7 @@ When ``__env__`` is specified as the branch name, ``all_saltenvs`` per-remote co
git_pillar_update_interval
~~~~~~~~~~~~~~~~~~~~~~~~~~
.. versionadded:: neon
.. versionadded:: 3000
This option defines the default update interval (in seconds) for git_pillar
remotes. The update is handled within the global loop, hence

2
salt/runners/saltutil.py
View file

@ -612,7 +612,7 @@ def sync_serializers(saltenv='base', extmod_whitelist=None, extmod_blacklist=Non
def sync_executors(saltenv='base', extmod_whitelist=None, extmod_blacklist=None):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Sync executor modules from ``salt://_executors`` to the master

4
salt/states/archive.py
View file

@ -437,7 +437,7 @@ def extracted(name,
minions ``hash_type`` config option to the same one that you're going
to pass via ``source_hash`` argument.
.. versionadded:: Neon
.. versionadded:: 3000
skip_verify : False
If ``True``, hash verification of remote file sources (``http://``,
@ -553,7 +553,7 @@ def extracted(name,
then re-create that directory before extracting. Note that ``clean``
and ``clean_parent`` are mutually exclusive.
.. versionadded:: Neon
.. versionadded:: 3000
user
The user to own each extracted file. Not available on Windows.

4
salt/states/beacon.py
View file

@ -31,9 +31,9 @@ Management of the Salt beacons
- 0.1
- 1.0
.. versionadded:: Neon
.. versionadded:: 3000
Beginning in the Neon release, multiple copies of a beacon can be configured
Beginning in the 3000 release, multiple copies of a beacon can be configured
using the ``beacon_module`` parameter.
inotify_infs:

2
salt/states/file.py
View file

@ -1627,7 +1627,7 @@ def symlink(
will be deleted to make room for the symlink, unless
backupname is set, when it will be renamed
.. versionchanged:: Neon
.. versionchanged:: 3000
Force will now remove all types of existing file system entries,
not just files, directories and symlinks.

4
salt/states/heat.py
View file

@ -36,7 +36,7 @@ mysql:
.. versionadded:: 2017.7.5,2018.3.1
The spelling mistake in parameter `enviroment` was corrected to `environment`.
The `enviroment` spelling mistake has been removed in Salt Neon.
The `enviroment` spelling mistake has been removed in Salt 3000.
'''
# Import Python libs
@ -131,7 +131,7 @@ def deployed(name, template=None, environment=None, params=None, poll=5,
.. versionadded:: 2017.7.5,2018.3.1
The spelling mistake in parameter `enviroment` was corrected to `environment`.
The `enviroment` spelling mistake has been removed in Salt Neon.
The `enviroment` spelling mistake has been removed in Salt 3000.
'''
log.debug(

2
salt/states/http.py
View file

@ -57,7 +57,7 @@ def query(name, match=None, match_type='string', status=None, status_type='strin
complex pattern matching is required. Additionally, if a list of strings representing
statuses is given, the type ``list`` can be used.
.. versionadded:: Neon
.. versionadded:: 3000
.. note::

6
salt/states/rabbitmq_upstream.py
View file

@ -15,7 +15,7 @@ Example:
- ack_mode: on-confirm
- max_hops: 1
.. versionadded:: Neon
.. versionadded:: 3000
'''
# Import python libs
@ -110,7 +110,7 @@ def present(name,
:param str queue: The name of the upstream queue. Default is to use the same
name as the federated queue.
.. versionadded:: Neon
.. versionadded:: 3000
'''
ret = {'name': name, 'result': False, 'comment': '', 'changes': {}}
@ -182,7 +182,7 @@ def absent(name, runas=None):
:param str name: The name of the upstream to remove
:param str runas: User to run the command
.. versionadded:: Neon
.. versionadded:: 3000
'''
ret = {'name': name, 'result': False, 'comment': '', 'changes': {}}

2
salt/states/saltutil.py
View file

@ -7,7 +7,7 @@ This state wraps the saltutil execution modules to make them easier to run
from a states. Rather than needing to to use ``module.run`` this state allows for
improved change detection.
.. versionadded: Neon
.. versionadded: 3000
'''
from __future__ import absolute_import, unicode_literals, print_function

2
salt/states/ssh_auth.py
View file

@ -521,7 +521,7 @@ def manage(
fingerprint_hash_type=None,
**kwargs):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Ensures that only the specified ssh_keys are present for the specified user

2
salt/states/test.py
View file

@ -197,7 +197,7 @@ def configurable_test_state(name, changes=True, result=True, comment='', warning
String to fill the comment field with.
Default is ''
.. versionadded:: Neon
.. versionadded:: 3000
warnings:
A string (or a list of strings) to fill the warnings field with.

12
salt/states/virt.py
View file

@ -343,12 +343,12 @@ def running(name,
The default value is taken from the host capabilities, with a preference for ``hvm``.
Only used when creating a new virtual machine.
.. versionadded:: Neon
.. versionadded:: 3000
:param arch:
architecture of the virtual machine. The default value is taken from the host capabilities,
but ``x86_64`` is prefed over ``i686``. Only used when creating a new virtual machine.
.. versionadded:: Neon
.. versionadded:: 3000
:param boot:
Specifies kernel for the virtual machine, as well as boot parameters
@ -365,7 +365,7 @@ def running(name,
'cmdline': 'console=ttyS0 ks=http://example.com/f8-i386/os/'
}
.. versionadded:: neon
.. versionadded:: 3000
.. rubric:: Example States
@ -677,14 +677,14 @@ def network_running(name,
for more details on this dictionary.
(Default: None).
.. versionadded:: neon
.. versionadded:: 3000
:param ipv6_config:
IPv6 network configuration. See the :py:func`virt.network_define
<salt.modules.virt.network_define>` function corresponding parameter documentation
for more details on this dictionary.
(Default: None).
.. versionadded:: neon
.. versionadded:: 3000
:param autostart: Network autostart (default ``'True'``)
:param connection: libvirt connection URI, overriding defaults
@ -970,7 +970,7 @@ def pool_deleted(name,
uyuni_virt.pool_deleted:
- purge: True
.. versionadded:: Neon
.. versionadded:: 3000
'''
ret = {'name': name, 'changes': {}, 'result': True, 'comment': ''}

2
salt/states/xml.py
View file

@ -25,7 +25,7 @@ def __virtual__():
def value_present(name, xpath, value, **kwargs):
'''
.. versionadded:: Neon
.. versionadded:: 3000
Manages a given XML file

2
salt/utils/data.py
View file

@ -1044,7 +1044,7 @@ def filter_falsey(data, recurse_depth=None, ignore_types=()):
:return type(data)
.. version-added:: Neon
.. version-added:: 3000
'''
filter_element = (
functools.partial(filter_falsey,