From b0145578bf2be29e2f38b36ed6aa0616f0dd3638 Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 14 Jun 2017 11:53:05 -0600 Subject: [PATCH] Update Nitrogen references to 2017.7.0 for states, utils, tests directory Also updated version.py with release tuple --- salt/states/boto3_elasticache.py | 2 +- salt/states/boto3_route53.py | 2 +- salt/states/boto_apigateway.py | 12 ++++---- salt/states/boto_iam_role.py | 2 +- salt/states/boto_kinesis.py | 2 +- salt/states/boto_lambda.py | 2 +- salt/states/bower.py | 2 +- salt/states/chocolatey.py | 2 +- salt/states/docker.py | 22 +++++++------- salt/states/docker_container.py | 10 +++---- salt/states/docker_image.py | 10 +++---- salt/states/docker_network.py | 4 +-- salt/states/docker_volume.py | 8 +++--- salt/states/elasticsearch.py | 2 +- salt/states/elasticsearch_index.py | 2 +- salt/states/elasticsearch_index_template.py | 2 +- salt/states/file.py | 32 +++++++++++++-------- salt/states/git.py | 6 ++-- salt/states/github.py | 2 +- salt/states/grafana4_dashboard.py | 2 +- salt/states/grafana4_datasource.py | 2 +- salt/states/grafana4_org.py | 2 +- salt/states/grafana4_user.py | 2 +- salt/states/heat.py | 2 +- salt/states/hg.py | 2 +- salt/states/icinga2.py | 2 +- salt/states/influxdb_continuous_query.py | 2 +- salt/states/influxdb_retention_policy.py | 2 +- salt/states/logrotate.py | 2 +- salt/states/loop.py | 2 +- salt/states/modjk_worker.py | 6 ++-- salt/states/module.py | 2 +- salt/states/msteams.py | 2 +- salt/states/mysql_query.py | 2 +- salt/states/netacl.py | 2 +- salt/states/netconfig.py | 2 +- salt/states/netyang.py | 2 +- salt/states/pkg.py | 4 +-- salt/states/saltmod.py | 10 +++---- salt/states/service.py | 14 ++++----- salt/states/solrcloud.py | 2 +- salt/states/ssh_known_hosts.py | 2 +- salt/states/statuspage.py | 2 +- salt/states/vault.py | 2 +- salt/states/virtualenv_mod.py | 2 +- salt/states/win_iis.py | 2 +- salt/states/win_wua.py | 2 +- salt/states/zabbix_host.py | 2 +- salt/utils/crypt.py | 2 +- salt/utils/jinja.py | 4 +-- salt/utils/napalm.py | 2 +- salt/utils/vmware.py | 2 +- salt/version.py | 2 +- tests/integration/shell/test_enabled.py | 6 ++-- tests/unit/modules/test_win_pki.py | 2 +- tests/unit/modules/test_win_snmp.py | 2 +- tests/unit/states/test_win_pki.py | 2 +- tests/unit/states/test_win_snmp.py | 2 +- 58 files changed, 122 insertions(+), 114 deletions(-) diff --git a/salt/states/boto3_elasticache.py b/salt/states/boto3_elasticache.py index 2ab15e7cb0..dd5cd96f6d 100644 --- a/salt/states/boto3_elasticache.py +++ b/salt/states/boto3_elasticache.py @@ -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. diff --git a/salt/states/boto3_route53.py b/salt/states/boto3_route53.py index b578781953..0a49dcc3fe 100644 --- a/salt/states/boto3_route53.py +++ b/salt/states/boto3_route53.py @@ -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. diff --git a/salt/states/boto_apigateway.py b/salt/states/boto_apigateway.py index 28adc200be..0f1ffc33fd 100644 --- a/salt/states/boto_apigateway.py +++ b/salt/states/boto_apigateway.py @@ -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 diff --git a/salt/states/boto_iam_role.py b/salt/states/boto_iam_role.py index 6b9841610e..84b0a24343 100644 --- a/salt/states/boto_iam_role.py +++ b/salt/states/boto_iam_role.py @@ -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) diff --git a/salt/states/boto_kinesis.py b/salt/states/boto_kinesis.py index f701215b2d..6b7e73a495 100644 --- a/salt/states/boto_kinesis.py +++ b/salt/states/boto_kinesis.py @@ -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. diff --git a/salt/states/boto_lambda.py b/salt/states/boto_lambda.py index 1baef96189..3c346d5490 100644 --- a/salt/states/boto_lambda.py +++ b/salt/states/boto_lambda.py @@ -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. diff --git a/salt/states/bower.py b/salt/states/bower.py index 3baca6ae74..ffcbb9c8a3 100644 --- a/salt/states/bower.py +++ b/salt/states/bower.py @@ -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. diff --git a/salt/states/chocolatey.py b/salt/states/chocolatey.py index eb7e9bc292..79c69048ef 100644 --- a/salt/states/chocolatey.py +++ b/salt/states/chocolatey.py @@ -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 diff --git a/salt/states/docker.py b/salt/states/docker.py index 595a26d637..962887445c 100644 --- a/salt/states/docker.py +++ b/salt/states/docker.py @@ -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 ` - 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 `. ''' @@ -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 `. ''' @@ -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 `. ''' @@ -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 `. ''' @@ -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 `. ''' @@ -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 `. ''' @@ -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 `. ''' @@ -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 `. ''' @@ -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 `. ''' diff --git a/salt/states/docker_container.py b/salt/states/docker_container.py index cf043148f1..b8eae874fc 100644 --- a/salt/states/docker_container.py +++ b/salt/states/docker_container.py @@ -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 ` 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 ` -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, ` 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 diff --git a/salt/states/docker_image.py b/salt/states/docker_image.py index 7fb6a7b887..e3c1a37779 100644 --- a/salt/states/docker_image.py +++ b/salt/states/docker_image.py @@ -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 ` 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': {}, diff --git a/salt/states/docker_network.py b/salt/states/docker_network.py index 250c133ebc..9d78d66b21 100644 --- a/salt/states/docker_network.py +++ b/salt/states/docker_network.py @@ -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 ` 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 diff --git a/salt/states/docker_volume.py b/salt/states/docker_volume.py index ce15967a59..84a4f2154d 100644 --- a/salt/states/docker_volume.py +++ b/salt/states/docker_volume.py @@ -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 ` 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 diff --git a/salt/states/elasticsearch.py b/salt/states/elasticsearch.py index 29fbae4256..2c37a304ce 100644 --- a/salt/states/elasticsearch.py +++ b/salt/states/elasticsearch.py @@ -2,7 +2,7 @@ ''' State module to manage Elasticsearch. -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 ''' # Import python libs diff --git a/salt/states/elasticsearch_index.py b/salt/states/elasticsearch_index.py index 5b4662ce71..bd4c3d1732 100644 --- a/salt/states/elasticsearch_index.py +++ b/salt/states/elasticsearch_index.py @@ -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 diff --git a/salt/states/elasticsearch_index_template.py b/salt/states/elasticsearch_index_template.py index a503a9b3fa..8bb0d7f2ee 100644 --- a/salt/states/elasticsearch_index_template.py +++ b/salt/states/elasticsearch_index_template.py @@ -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 diff --git a/salt/states/file.py b/salt/states/file.py index c354579a9e..64cffa15a2 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -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 diff --git a/salt/states/git.py b/salt/states/git.py index 317800e649..7a710fee10 100644 --- a/salt/states/git.py +++ b/salt/states/git.py @@ -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 diff --git a/salt/states/github.py b/salt/states/github.py index a744bdc3a9..4b84ca77a5 100644 --- a/salt/states/github.py +++ b/salt/states/github.py @@ -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: diff --git a/salt/states/grafana4_dashboard.py b/salt/states/grafana4_dashboard.py index 8dc575665e..0f3318c3b8 100644 --- a/salt/states/grafana4_dashboard.py +++ b/salt/states/grafana4_dashboard.py @@ -2,7 +2,7 @@ ''' Manage Grafana v4.0 Dashboards -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 .. code-block:: yaml diff --git a/salt/states/grafana4_datasource.py b/salt/states/grafana4_datasource.py index 9d5d40b242..7ae3ef3e95 100644 --- a/salt/states/grafana4_datasource.py +++ b/salt/states/grafana4_datasource.py @@ -2,7 +2,7 @@ ''' Manage Grafana v4.0 data sources -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 Token auth setup diff --git a/salt/states/grafana4_org.py b/salt/states/grafana4_org.py index efbd200597..08376ba5cd 100644 --- a/salt/states/grafana4_org.py +++ b/salt/states/grafana4_org.py @@ -2,7 +2,7 @@ ''' Manage Grafana v4.0 orgs -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 Token auth setup diff --git a/salt/states/grafana4_user.py b/salt/states/grafana4_user.py index ae7ede7780..ce1a46c50b 100644 --- a/salt/states/grafana4_user.py +++ b/salt/states/grafana4_user.py @@ -2,7 +2,7 @@ ''' Manage Grafana v4.0 users -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 Token auth setup diff --git a/salt/states/heat.py b/salt/states/heat.py index f7d1e02093..c5f40f1687 100644 --- a/salt/states/heat.py +++ b/salt/states/heat.py @@ -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. diff --git a/salt/states/hg.py b/salt/states/hg.py index 0d74373fae..0b6425d863 100644 --- a/salt/states/hg.py +++ b/salt/states/hg.py @@ -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': {}} diff --git a/salt/states/icinga2.py b/salt/states/icinga2.py index cd8f3b049e..fe2b75b5bb 100644 --- a/salt/states/icinga2.py +++ b/salt/states/icinga2.py @@ -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. diff --git a/salt/states/influxdb_continuous_query.py b/salt/states/influxdb_continuous_query.py index 6750144def..bf585adc7b 100644 --- a/salt/states/influxdb_continuous_query.py +++ b/salt/states/influxdb_continuous_query.py @@ -3,7 +3,7 @@ Management of Influxdb continuous queries ========================================= -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 (compatible with InfluxDB version 0.9+) ''' diff --git a/salt/states/influxdb_retention_policy.py b/salt/states/influxdb_retention_policy.py index d66322c793..3fc7853465 100644 --- a/salt/states/influxdb_retention_policy.py +++ b/salt/states/influxdb_retention_policy.py @@ -3,7 +3,7 @@ Management of Influxdb retention policies ========================================= -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 (compatible with InfluxDB version 0.9+) ''' diff --git a/salt/states/logrotate.py b/salt/states/logrotate.py index f3bebbf05a..bfee6de49e 100644 --- a/salt/states/logrotate.py +++ b/salt/states/logrotate.py @@ -2,7 +2,7 @@ ''' Module for managing logrotate. -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 ''' diff --git a/salt/states/loop.py b/salt/states/loop.py index 4c8343e01a..331292abc0 100644 --- a/salt/states/loop.py +++ b/salt/states/loop.py @@ -4,7 +4,7 @@ Loop state Allows for looping over execution modules. -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 .. code-block:: yaml diff --git a/salt/states/modjk_worker.py b/salt/states/modjk_worker.py index f7faa7c94e..f902d99c0a 100644 --- a/salt/states/modjk_worker.py +++ b/salt/states/modjk_worker.py @@ -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``. diff --git a/salt/states/module.py b/salt/states/module.py index 1281a37374..6fd9f541cf 100644 --- a/salt/states/module.py +++ b/salt/states/module.py @@ -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 diff --git a/salt/states/msteams.py b/salt/states/msteams.py index 39e4f37c77..59715bb6cb 100644 --- a/salt/states/msteams.py +++ b/salt/states/msteams.py @@ -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: diff --git a/salt/states/mysql_query.py b/salt/states/mysql_query.py index 597bc8302d..b2ea6c1c3c 100644 --- a/salt/states/mysql_query.py +++ b/salt/states/mysql_query.py @@ -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': {}, diff --git a/salt/states/netacl.py b/salt/states/netacl.py index b69361c598..df97c76b6e 100644 --- a/salt/states/netacl.py +++ b/salt/states/netacl.py @@ -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 :maturity: new diff --git a/salt/states/netconfig.py b/salt/states/netconfig.py index dbd4e655eb..9318e227b4 100644 --- a/salt/states/netconfig.py +++ b/salt/states/netconfig.py @@ -15,7 +15,7 @@ Dependencies - :mod:`NAPALM proxy minion ` - :mod:`Network-related basic features execution module ` -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 ''' from __future__ import absolute_import diff --git a/salt/states/netyang.py b/salt/states/netyang.py index 3a2ecd0e93..e39b09b3b9 100644 --- a/salt/states/netyang.py +++ b/salt/states/netyang.py @@ -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 ------------ diff --git a/salt/states/pkg.py b/salt/states/pkg.py index f5f513b856..13c77eb417 100644 --- a/salt/states/pkg.py +++ b/salt/states/pkg.py @@ -803,7 +803,7 @@ def installed( ` in 2014.1.0, and was expanded to :py:func:`Debian/Ubuntu ` and :py:func:`Arch Linux `-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, diff --git a/salt/states/saltmod.py b/salt/states/saltmod.py index edda4046bf..d9c41f8cb3 100644 --- a/salt/states/saltmod.py +++ b/salt/states/saltmod.py @@ -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, diff --git a/salt/states/service.py b/salt/states/service.py index 671f0a9ca5..7b68ee0040 100644 --- a/salt/states/service.py +++ b/salt/states/service.py @@ -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_. diff --git a/salt/states/solrcloud.py b/salt/states/solrcloud.py index 040f05ac67..7e738d2c6f 100644 --- a/salt/states/solrcloud.py +++ b/salt/states/solrcloud.py @@ -2,7 +2,7 @@ ''' States for solrcloud alias and collection configuration -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 ''' diff --git a/salt/states/ssh_known_hosts.py b/salt/states/ssh_known_hosts.py index 18c50cff17..027b6d5945 100644 --- a/salt/states/ssh_known_hosts.py +++ b/salt/states/ssh_known_hosts.py @@ -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, diff --git a/salt/states/statuspage.py b/salt/states/statuspage.py index bc1d298efa..a7a04e825f 100644 --- a/salt/states/statuspage.py +++ b/salt/states/statuspage.py @@ -16,7 +16,7 @@ In the minion configuration file, the following block is required: api_key: page_id: -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 ''' from __future__ import unicode_literals diff --git a/salt/states/vault.py b/salt/states/vault.py index e0eac5b81d..d86bc4cb0a 100644 --- a/salt/states/vault.py +++ b/salt/states/vault.py @@ -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. diff --git a/salt/states/virtualenv_mod.py b/salt/states/virtualenv_mod.py index 041186a6d1..81ee1707e8 100644 --- a/salt/states/virtualenv_mod.py +++ b/salt/states/virtualenv_mod.py @@ -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``. diff --git a/salt/states/win_iis.py b/salt/states/win_iis.py index 869c8d6e2d..614236afc1 100644 --- a/salt/states/win_iis.py +++ b/salt/states/win_iis.py @@ -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 diff --git a/salt/states/win_wua.py b/salt/states/win_wua.py index 6b0d1c26db..835dea28ce 100644 --- a/salt/states/win_wua.py +++ b/salt/states/win_wua.py @@ -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: diff --git a/salt/states/zabbix_host.py b/salt/states/zabbix_host.py index 211fa285cd..7220297db2 100644 --- a/salt/states/zabbix_host.py +++ b/salt/states/zabbix_host.py @@ -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) diff --git a/salt/utils/crypt.py b/salt/utils/crypt.py index 574689f90c..51003b939e 100644 --- a/salt/utils/crypt.py +++ b/salt/utils/crypt.py @@ -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 diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py index 71abd9d77a..f122f01651 100644 --- a/salt/utils/jinja.py +++ b/salt/utils/jinja.py @@ -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. diff --git a/salt/utils/napalm.py b/salt/utils/napalm.py index 0ef3569e90..c69a92432e 100644 --- a/salt/utils/napalm.py +++ b/salt/utils/napalm.py @@ -12,7 +12,7 @@ Utils for the NAPALM modules and proxy. - :mod:`SNMP configuration module ` - :mod:`Users configuration management ` -.. versionadded:: Nitrogen +.. versionadded:: 2017.7.0 ''' from __future__ import absolute_import diff --git a/salt/utils/vmware.py b/salt/utils/vmware.py index 48c14fd86c..19292f2128 100644 --- a/salt/utils/vmware.py +++ b/salt/utils/vmware.py @@ -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 diff --git a/salt/version.py b/salt/version.py index c0bc09ea9c..9bc2bf2883 100644 --- a/salt/version.py +++ b/salt/version.py @@ -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 diff --git a/tests/integration/shell/test_enabled.py b/tests/integration/shell/test_enabled.py index 4e155cfca3..1b3685dfaf 100644 --- a/tests/integration/shell/test_enabled.py +++ b/tests/integration/shell/test_enabled.py @@ -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' diff --git a/tests/unit/modules/test_win_pki.py b/tests/unit/modules/test_win_pki.py index a59a0d581b..8466da9310 100644 --- a/tests/unit/modules/test_win_pki.py +++ b/tests/unit/modules/test_win_pki.py @@ -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 diff --git a/tests/unit/modules/test_win_snmp.py b/tests/unit/modules/test_win_snmp.py index 90e2d08826..9660d5d6a0 100644 --- a/tests/unit/modules/test_win_snmp.py +++ b/tests/unit/modules/test_win_snmp.py @@ -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 diff --git a/tests/unit/states/test_win_pki.py b/tests/unit/states/test_win_pki.py index 13bdc164dd..751a2df6cc 100644 --- a/tests/unit/states/test_win_pki.py +++ b/tests/unit/states/test_win_pki.py @@ -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 diff --git a/tests/unit/states/test_win_snmp.py b/tests/unit/states/test_win_snmp.py index c4753f82d9..3618d01ab0 100644 --- a/tests/unit/states/test_win_snmp.py +++ b/tests/unit/states/test_win_snmp.py @@ -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