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

Update Nitrogen references to 2017.7.0 for states, utils, tests directory

Browse Source 
Also updated version.py with release tuple
This commit is contained in:
rallytime 2017-06-14 11:53:05 -06:00
parent c5b75d030a
commit b0145578bf
58 changed files with 122 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/boto3_elasticache.py
View File

@ -3,7 +3,7 @@
Manage Elasticache with boto3
=============================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create, destroy and update Elasticache clusters. Be aware that this interacts
with Amazon's services, and so may incur charges.

2
salt/states/boto3_route53.py
View File

@ -2,7 +2,7 @@
'''
Manage Route53 records with Boto 3
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create and delete Route53 records. Be aware that this interacts with Amazon's
services, and so may incur charges.

12
salt/states/boto_apigateway.py
View File

@ -225,13 +225,13 @@ def present(name, api_name, swagger_file, stage_name, api_key_required,
'#end\n'
' ]\n'
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
response_template
String value that defines the response template mapping applied in case of success (including OPTIONS method)
If set to None, empty ({}) template is assumed, which will transfer response from the lambda function as is.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
ret = {'name': name,
'result': True,
@ -1674,7 +1674,7 @@ def usage_plan_present(name, plan_name, description=None, throttle=None, quota=N
'''
Ensure the spcifieda usage plan with the corresponding metrics is deployed
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
name
name of the state
@ -1814,7 +1814,7 @@ def usage_plan_absent(name, plan_name, region=None, key=None, keyid=None, profil
'''
Ensures usage plan identified by name is no longer present
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
name
name of the state
@ -1880,7 +1880,7 @@ def usage_plan_association_present(name, plan_name, api_stages, region=None, key
'''
Ensures usage plan identified by name is added to provided api_stages
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
name
name of the state
@ -1975,7 +1975,7 @@ def usage_plan_association_absent(name, plan_name, api_stages, region=None, key=
If a plan is associated to stages not listed in api_stages parameter,
those associations remain intact.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
name
name of the state

2
salt/states/boto_iam_role.py
View File

@ -129,7 +129,7 @@ def present(
defined here will be appended with the policy document statements
defined in the policy_document argument.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
path
The path to the role/instance profile. (See https://boto.readthedocs.io/en/latest/ref/iam.html#boto.iam.connection.IAMConnection.create_role)

2
salt/states/boto_kinesis.py
View File

@ -3,7 +3,7 @@
Manage Kinesis Streams
======================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create and destroy Kinesis streams. Be aware that this interacts with Amazon's
services, and so may incur charges.

2
salt/states/boto_lambda.py
View File

@ -183,7 +183,7 @@ def function_present(name, FunctionName, Runtime, Role, Handler, ZipFile=None,
}
}
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
region
Region to connect to.

2
salt/states/bower.py
View File

@ -275,7 +275,7 @@ def bootstrap(name, user=None):
def pruned(name, user=None, env=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Cleans up local bower_components directory.

2
salt/states/chocolatey.py
View File

@ -67,7 +67,7 @@ def installed(name, version=None, source=None, force=False, pre_versions=False,
Allow mulitiple versions of the package to be installed. Do not use
with ``force``. Does not work with all packages. Default is False.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. code-block:: yaml

22
salt/states/docker.py
View File

@ -2,12 +2,12 @@
'''
States to manage Docker containers, images, volumes, and networks
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
The legacy Docker state and execution module have been removed, and the
new modules (formerly called ``dockerng`` have taken their places).
.. important::
As of the Nitrogen release, the states in this module have been separated
As of the 2017.7.0 release, the states in this module have been separated
into the following four state modules:
- :mod:`docker_container <salt.states.docker_container>` - States to manage
@ -81,7 +81,7 @@ def __virtual__():
def running(name, **kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_container.running
<salt.states.docker_container.running>`.
'''
@ -101,7 +101,7 @@ def running(name, **kwargs):
def stopped(**kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_container.stopped
<salt.states.docker_container.stopped>`.
'''
@ -120,7 +120,7 @@ def stopped(**kwargs):
def absent(name, **kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_container.absent
<salt.states.docker_container.absent>`.
'''
@ -140,7 +140,7 @@ def absent(name, **kwargs):
def network_present(name, **kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_network.present
<salt.states.docker_network.present>`.
'''
@ -160,7 +160,7 @@ def network_present(name, **kwargs):
def network_absent(name, **kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_network.absent
<salt.states.docker_network.absent>`.
'''
@ -180,7 +180,7 @@ def network_absent(name, **kwargs):
def image_present(name, **kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_image.present
<salt.states.docker_image.present>`.
'''
@ -200,7 +200,7 @@ def image_present(name, **kwargs):
def image_absent(**kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_image.absent
<salt.states.docker_image.absent>`.
'''
@ -219,7 +219,7 @@ def image_absent(**kwargs):
def volume_present(name, driver=None, driver_opts=None, force=False):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_volume.present
<salt.states.docker_volume.present>`.
'''
@ -239,7 +239,7 @@ def volume_present(name, driver=None, driver_opts=None, force=False):
def volume_absent(name, driver=None):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
This state has been moved to :py:func:`docker_volume.absent
<salt.states.docker_volume.absent>`.
'''

10
salt/states/docker_container.py
View File

@ -2,7 +2,7 @@
'''
Management of Docker containers
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: docker_ Python module
@ -28,9 +28,9 @@ Management of Docker containers
.. _docker-py: https://pypi.python.org/pypi/docker-py
These states were moved from the :mod:`docker <salt.states.docker>` state
module (formerly called **dockerng**) in the Nitrogen release. When running the
module (formerly called **dockerng**) in the 2017.7.0 release. When running the
:py:func:`docker_container.running <salt.states.docker_container.running>`
state for the first time after upgrading to Nitrogen, your container(s) may be
state for the first time after upgrading to 2017.7.0, your container(s) may be
replaced. The changes may show diffs for certain parameters which say that the
old value was an empty string, and the new value is ``None``. This is due to
the fact that in prior releases Salt was passing empty strings for these values
@ -254,7 +254,7 @@ def running(name,
<salt.modules.dockermod.stop>` as the ``timeout`` value, telling Docker
how long to wait for a graceful shutdown before killing the container.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
This option was renamed from ``stop_timeout`` to
``shutdown_timeout`` to acommodate the ``stop_timeout`` container
configuration setting.
@ -1322,7 +1322,7 @@ def running(name,
- stop_timeout: 5
.. note::
In releases prior to Nitrogen, this option was not set in the
In releases prior to 2017.7.0, this option was not set in the
container configuration, but rather this timeout was enforced only
when shutting down an existing container to replace it. To remove
the ambiguity, and to allow for the container to have a stop

10
salt/states/docker_image.py
View File

@ -2,7 +2,7 @@
'''
Management of Docker images
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: docker_ Python module
@ -28,7 +28,7 @@ Management of Docker images
.. _docker-py: https://pypi.python.org/pypi/docker-py
These states were moved from the :mod:`docker <salt.states.docker>` state
module (formerly called **dockerng**) in the Nitrogen release.
module (formerly called **dockerng**) in the 2017.7.0 release.
.. note::
To pull from a Docker registry, authentication must be configured. See
@ -148,17 +148,17 @@ def present(name,
- base: centos
- saltenv: base
.. versionadded: Nitrogen
.. versionadded: 2017.7.0
base
Base image with which to start ``dockerng.sls_build``
.. versionadded: Nitrogen
.. versionadded: 2017.7.0
saltenv
environment from which to pull sls files for ``dockerng.sls_build``.
.. versionadded: Nitrogen
.. versionadded: 2017.7.0
'''
ret = {'name': name,
'changes': {},

4
salt/states/docker_network.py
View File

@ -2,7 +2,7 @@
'''
Management of Docker networks
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: docker_ Python module
@ -28,7 +28,7 @@ Management of Docker networks
.. _docker-py: https://pypi.python.org/pypi/docker-py
These states were moved from the :mod:`docker <salt.states.docker>` state
module (formerly called **dockerng**) in the Nitrogen release.
module (formerly called **dockerng**) in the 2017.7.0 release.
'''
from __future__ import absolute_import
import logging

8
salt/states/docker_volume.py
View File

@ -2,7 +2,7 @@
'''
Management of Docker volumes
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: docker_ Python module
@ -28,7 +28,7 @@ Management of Docker volumes
.. _docker-py: https://pypi.python.org/pypi/docker-py
These states were moved from the :mod:`docker <salt.states.docker>` state
module (formerly called **dockerng**) in the Nitrogen release.
module (formerly called **dockerng**) in the 2017.7.0 release.
'''
from __future__ import absolute_import
import logging
@ -75,7 +75,7 @@ def present(name, driver=None, driver_opts=None, force=False):
This state no longer deletes and re-creates a volume if the existing
volume's driver does not match the ``driver`` parameter (unless the
``force`` parameter is set to ``True``).
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
This state was renamed from **docker.volume_present** to **docker_volume.present**
name
@ -197,7 +197,7 @@ def absent(name, driver=None):
Ensure that a volume is absent.
.. versionadded:: 2015.8.4
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
This state was renamed from **docker.volume_absent** to **docker_volume.absent**
name

2
salt/states/elasticsearch.py
View File

@ -2,7 +2,7 @@
'''
State module to manage Elasticsearch.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
# Import python libs

2
salt/states/elasticsearch_index.py
View File

@ -3,7 +3,7 @@
State module to manage Elasticsearch indices
.. versionadded:: 2015.8.0
.. deprecated:: Nitrogen Use elasticsearch state instead
.. deprecated:: 2017.7.0 Use elasticsearch state instead
'''
# Import python libs

2
salt/states/elasticsearch_index_template.py
View File

@ -3,7 +3,7 @@
State module to manage Elasticsearch index templates
.. versionadded:: 2015.8.0
.. deprecated:: Nitrogen Use elasticsearch state instead
.. deprecated:: 2017.7.0 Use elasticsearch state instead
'''
# Import python libs

32
salt/states/file.py
View File

@ -1919,14 +1919,14 @@ def managed(name,
See https://docs.python.org/3/library/codecs.html#standard-encodings
for available encodings.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
encoding_errors : 'strict'
Error encoding scheme. Default is ```'strict'```.
See https://docs.python.org/2/library/codecs.html#codec-base-classes
for the list of available schemes.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
allow_empty : True
.. versionadded:: 2015.8.4
@ -1998,26 +1998,30 @@ def managed(name,
The owner of the directory. If this is not passed, user will be used. If
user is not passed, the account under which Salt is running will be
used.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
win_perms : None
A dictionary containing permissions to grant and their propagation. For
example: ``{'Administrators': {'perms': 'full_control'}}`` Can be a
single basic perm or a list of advanced perms. ``perms`` must be
specified. ``applies_to`` does not apply to file objects.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
win_deny_perms : None
A dictionary containing permissions to deny and their propagation. For
example: ``{'Administrators': {'perms': 'full_control'}}`` Can be a
single basic perm or a list of advanced perms. ``perms`` must be
specified. ``applies_to`` does not apply to file objects.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
win_inheritance : True
True to inherit permissions from the parent directory, False not to
inherit permission.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Here's an example using the above ``win_*`` parameters:
@ -2673,7 +2677,8 @@ def directory(name,
The owner of the directory. If this is not passed, user will be used. If
user is not passed, the account under which Salt is running will be
used.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
win_perms : None
A dictionary containing permissions to grant and their propagation. For
@ -2681,19 +2686,22 @@ def directory(name,
'this_folder_only'}}`` Can be a single basic perm or a list of advanced
perms. ``perms`` must be specified. ``applies_to`` is optional and
defaults to ``this_folder_subfoler_files``.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
win_deny_perms : None
A dictionary containing permissions to deny and their propagation. For
example: ``{'Administrators': {'perms': 'full_control', 'applies_to':
'this_folder_only'}}`` Can be a single basic perm or a list of advanced
perms.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
win_inheritance : True
True to inherit permissions from the parent directory, False not to
inherit permission.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Here's an example using the above ``win_*`` parameters:
@ -5545,14 +5553,14 @@ def serialize(name,
See https://docs.python.org/3/library/codecs.html#standard-encodings
for available encodings.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
encoding_errors : 'strict'
Error encoding scheme. Default is ```'strict'```.
See https://docs.python.org/2/library/codecs.html#codec-base-classes
for the list of available schemes.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
user
The user to own the directory, this defaults to the user salt is

6
salt/states/git.py
View File

@ -511,13 +511,13 @@ def latest(name,
A glob expression defining which branches to retrieve when fetching.
See `git-fetch(1)`_ for more information on how refspecs work.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
refspec_tag : *
A glob expression defining which tags to retrieve when fetching. See
`git-fetch(1)`_ for more information on how refspecs work.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. _`git-fetch(1)`: http://git-scm.com/docs/git-fetch
@ -2036,7 +2036,7 @@ def detached(name,
and checked out.
ref
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
Use ``rev`` instead.
target

2
salt/states/github.py
View File

@ -524,7 +524,7 @@ def repo_present(
The teams for which this repo should belong to, specified as a dict of
team name to permission ('pull', 'push' or 'admin').
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Example:

2
salt/states/grafana4_dashboard.py
View File

@ -2,7 +2,7 @@
'''
Manage Grafana v4.0 Dashboards
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. code-block:: yaml

2
salt/states/grafana4_datasource.py
View File

@ -2,7 +2,7 @@
'''
Manage Grafana v4.0 data sources
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Token auth setup

2
salt/states/grafana4_org.py
View File

@ -2,7 +2,7 @@
'''
Manage Grafana v4.0 orgs
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Token auth setup

2
salt/states/grafana4_user.py
View File

@ -2,7 +2,7 @@
'''
Manage Grafana v4.0 users
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Token auth setup

2
salt/states/heat.py
View File

@ -3,7 +3,7 @@
Management of Heat
==================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: - heat Python module
:configuration: See :py:mod:`salt.modules.heat` for setup instructions.

2
salt/states/hg.py
View File

@ -83,7 +83,7 @@ def latest(name,
update_head
Should we update the head if new changes are found? Defaults to True
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
ret = {'name': name, 'result': True, 'comment': '', 'changes': {}}

2
salt/states/icinga2.py
View File

@ -3,7 +3,7 @@
Icinga2 state
=============
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: - Icinga2 Python module
:configuration: See :py:mod:`salt.modules.icinga2` for setup instructions.

2
salt/states/influxdb_continuous_query.py
View File

@ -3,7 +3,7 @@
Management of Influxdb continuous queries
=========================================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
(compatible with InfluxDB version 0.9+)
'''

2
salt/states/influxdb_retention_policy.py
View File

@ -3,7 +3,7 @@
Management of Influxdb retention policies
=========================================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
(compatible with InfluxDB version 0.9+)
'''

2
salt/states/logrotate.py
View File

@ -2,7 +2,7 @@
'''
Module for managing logrotate.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''

2
salt/states/loop.py
View File

@ -4,7 +4,7 @@ Loop state
Allows for looping over execution modules.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. code-block:: yaml

6
salt/states/modjk_worker.py
View File

@ -174,7 +174,7 @@ def _talk2modjk(name, lbn, target, action, profile='default', tgt_type='glob'):
def stop(name, lbn, target, profile='default', tgt_type='glob', expr_form=None):
'''
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
The ``expr_form`` argument has been renamed to ``tgt_type``, earlier
releases must use ``expr_form``.
@ -208,7 +208,7 @@ def stop(name, lbn, target, profile='default', tgt_type='glob', expr_form=None):
def activate(name, lbn, target, profile='default', tgt_type='glob', expr_form=None):
'''
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
The ``expr_form`` argument has been renamed to ``tgt_type``, earlier
releases must use ``expr_form``.
@ -242,7 +242,7 @@ def activate(name, lbn, target, profile='default', tgt_type='glob', expr_form=No
def disable(name, lbn, target, profile='default', tgt_type='glob', expr_form=None):
'''
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
The ``expr_form`` argument has been renamed to ``tgt_type``, earlier
releases must use ``expr_form``.

2
salt/states/module.py
View File

@ -337,7 +337,7 @@ def _call_function(name, returner=None, **kwargs):
def _run(name, **kwargs):
'''
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
Function name stays the same, behaviour will change.
Run a single module function

2
salt/states/msteams.py
View File

@ -3,7 +3,7 @@
Send a message card to Microsoft Teams
=======================
This state is useful for sending messages to Teams during state runs.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. code-block:: yaml
teams-message:
msteams.post_card:

2
salt/states/mysql_query.py
View File

@ -84,7 +84,7 @@ def run_file(name,
overwrite:
The file or grain will be overwritten if it already exists (default)
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
ret = {'name': name,
'changes': {},

2
salt/states/netacl.py
View File

@ -8,7 +8,7 @@ The firewall configuration is generated by Capirca_.
.. _Capirca: https://github.com/google/capirca
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:codeauthor: Mircea Ulinic <mircea@cloudflare.com>
:maturity: new

2
salt/states/netconfig.py
View File

@ -15,7 +15,7 @@ Dependencies
- :mod:`NAPALM proxy minion <salt.proxy.napalm>`
- :mod:`Network-related basic features execution module <salt.modules.napalm_network>`
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import absolute_import

2
salt/states/netyang.py
View File

@ -6,7 +6,7 @@ NAPALM YANG state
Manage the configuration of network devices according to
the YANG models (OpenConfig/IETF).
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Dependencies
------------

4
salt/states/pkg.py
View File

@ -803,7 +803,7 @@ def installed(
<salt.modules.yumpkg.list_repo_pkgs>` in 2014.1.0, and was expanded to
:py:func:`Debian/Ubuntu <salt.modules.aptpkg.list_repo_pkgs>` and
:py:func:`Arch Linux <salt.modules.pacman.list_repo_pkgs>`-based
distros in the Nitrogen release.
distros in the 2017.7.0 release.
The version strings returned by either of these functions can be used
as version specifiers in pkg states.
@ -825,7 +825,7 @@ def installed(
**WILDCARD VERSIONS**
As of the Nitrogen release, this state now supports wildcards in
As of the 2017.7.0 release, this state now supports wildcards in
package versions for SUSE SLES/Leap/Tumbleweed, Debian/Ubuntu, RHEL/CentOS,
Arch Linux, and their derivatives. Using wildcards can be useful for
packages where the release name is built into the version in some way,

10
salt/states/saltmod.py
View File

@ -100,7 +100,7 @@ def state(name,
The target type to resolve, defaults to ``glob``
expr_form
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
Use tgt_type instead
ret
@ -128,7 +128,7 @@ def state(name,
pillarenv
The pillar environment to grab pillars from
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
saltenv
The default salt environment to pull sls files from
@ -167,7 +167,7 @@ def state(name,
subset
Number of minions from the targeted set to randomly use
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Examples:
@ -406,7 +406,7 @@ def function(
The target type, defaults to ``glob``
expr_form
.. deprecated:: Nitrogen
.. deprecated:: 2017.7.0
Use tgt_type instead
arg
@ -437,7 +437,7 @@ def function(
subset
Number of minions from the targeted set to randomly use
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
func_ret = {'name': name,

14
salt/states/service.py
View File

@ -360,13 +360,13 @@ def running(name,
no_block : False
**For systemd minions only.** Starts the service using ``--no-block``.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
unmask : False
**For systemd minions only.** Set to ``True`` to remove an indefinite
mask before attempting to start the service.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
In previous releases, Salt would simply unmask a service before
making any changes. This behavior is no longer the default.
@ -374,7 +374,7 @@ def running(name,
**For systemd minions only.** Set to ``True`` to remove a runtime mask
before attempting to start the service.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
In previous releases, Salt would simply unmask a service before
making any changes. This behavior is no longer the default.
@ -513,12 +513,12 @@ def dead(name,
Add a sleep command (in seconds) before the check to make sure service
is killed.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
no_block : False
**For systemd minions only.** Stops the service using ``--no-block``.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
ret = {'name': name,
'changes': {},
@ -653,7 +653,7 @@ def disabled(name, **kwargs):
def masked(name, runtime=False):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This state is only available on minions which use systemd_.
@ -738,7 +738,7 @@ def masked(name, runtime=False):
def unmasked(name, runtime=False):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This state is only available on minions which use systemd_.

2
salt/states/solrcloud.py
View File

@ -2,7 +2,7 @@
'''
States for solrcloud alias and collection configuration
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''

2
salt/states/ssh_known_hosts.py
View File

@ -103,7 +103,7 @@ def present(
was originally hashed with. This defaults to ``sha256`` if not specified.
.. versionadded:: 2016.11.4
.. versionchanged:: Nitrogen: default changed from ``md5`` to ``sha256``
.. versionchanged:: 2017.7.0: default changed from ``md5`` to ``sha256``
'''
ret = {'name': name,

2
salt/states/statuspage.py
View File

@ -16,7 +16,7 @@ In the minion configuration file, the following block is required:
api_key: <API_KEY>
page_id: <PAGE_ID>
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import unicode_literals

2
salt/states/vault.py
View File

@ -4,7 +4,7 @@
:maturity: new
:platform: all
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
States for managing Hashicorp Vault. Currently handles policies. Configuration
instructions are documented in the execution module docs.

2
salt/states/virtualenv_mod.py
View File

@ -113,7 +113,7 @@ def managed(name,
process_dependency_links: False
Run pip install with the --process_dependency_links flag.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Also accepts any kwargs that the virtualenv module will. However, some
kwargs, such as the ``pip`` option, require ``- distribute: True``.

2
salt/states/win_iis.py
View File

@ -784,7 +784,7 @@ def set_app(name, site, settings=None):
: userName: "connectAs" user
: password: "connectAs" password for user
:rtype: bool
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Example of usage:
.. code-block:: yaml

2
salt/states/win_wua.py
View File

@ -2,7 +2,7 @@
'''
Installation of Windows Updates using the Windows Update Agent
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Salt can manage Windows updates via the "wua" state module. Updates can be
installed and removed. Update management declarations are as follows:

2
salt/states/zabbix_host.py
View File

@ -368,7 +368,7 @@ def assign_templates(host, templates, **kwargs):
'''
Ensures that templates are assigned to the host.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:param host: technical name of the host
:param _connection_user: Optional - zabbix user (can also be set in opts or pillar, see module's docstring)

2
salt/utils/crypt.py
View File

@ -19,7 +19,7 @@ def decrypt(data,
opts=None,
valid_rend=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Decrypt a data structure using the specified renderer. Written originally
as a common codebase to handle decryption of encrypted elements within

4
salt/utils/jinja.py
View File

@ -639,7 +639,7 @@ class SerializerExtension(Extension, object):
** Escape Filters **
..versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Allows escaping of strings so they can be interpreted literally by another
function.
@ -656,7 +656,7 @@ class SerializerExtension(Extension, object):
** Set Theory Filters **
..versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Performs set math using Jinja filters.

2
salt/utils/napalm.py
View File

@ -12,7 +12,7 @@ Utils for the NAPALM modules and proxy.
- :mod:`SNMP configuration module <salt.modules.napalm_snmp>`
- :mod:`Users configuration management <salt.modules.napalm_users>`
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import absolute_import

2
salt/utils/vmware.py
View File

@ -988,7 +988,7 @@ def create_datacenter(service_instance, datacenter_name):
'''
Creates a datacenter.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
service_instance
The Service Instance Object

2
salt/version.py
View File

@ -93,7 +93,7 @@ class SaltStackVersion(object):
'Beryllium' : (2015, 8),
'Boron' : (2016, 3),
'Carbon' : (2016, 11),
'Nitrogen' : (MAX_SIZE - 102, 0),
'Nitrogen' : (2017, 7),
'Oxygen' : (MAX_SIZE - 101, 0),
'Fluorine' : (MAX_SIZE - 100, 0),
# pylint: disable=E8265

6
tests/integration/shell/test_enabled.py
View File

@ -47,8 +47,8 @@ class EnabledTest(ModuleCase):
Test cmd.shell works correctly when using a template.
Note: This test used to test that python_shell defaulted to True for templates
in releases before Nitrogen. The cmd.run --> cmd.shell aliasing was removed in
Nitrogen. Templates should now be using cmd.shell.
in releases before 2017.7.0. The cmd.run --> cmd.shell aliasing was removed in
2017.7.0. Templates should now be using cmd.shell.
'''
state_name = 'template_shell_enabled'
state_filename = state_name + '.sls'
@ -75,7 +75,7 @@ class EnabledTest(ModuleCase):
def test_template_default_disabled(self):
'''
test shell disabled output for templates (python_shell=False is the default
beginning with the Nitrogen release).
beginning with the 2017.7.0 release).
'''
state_name = 'template_shell_disabled'
state_filename = state_name + '.sls'

2
tests/unit/modules/test_win_pki.py
View File

@ -3,7 +3,7 @@
:synopsis: Unit Tests for Windows PKI Module 'module.win_pki'
:platform: Windows
:maturity: develop
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
# Import Python Libs

2
tests/unit/modules/test_win_snmp.py
View File

@ -3,7 +3,7 @@
:synopsis: Unit Tests for Windows SNMP Module 'module.win_snmp'
:platform: Windows
:maturity: develop
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
# Import Python Libs

2
tests/unit/states/test_win_pki.py
View File

@ -3,7 +3,7 @@
:synopsis: Unit Tests for Windows PKI Module 'state.win_pki'
:platform: Windows
:maturity: develop
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
# Import Python Libs

2
tests/unit/states/test_win_snmp.py
View File

@ -3,7 +3,7 @@
:synopsis: Unit Tests for Windows SNMP Module 'state.win_snmp'
:platform: Windows
:maturity: develop
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
# Import Python Libs