valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2017.7' into 'develop'

Browse Source 
Conflicts:
  - salt/engines/slack.py
This commit is contained in:
rallytime 2017-06-15 10:57:27 -06:00
commit 7fef4cf38f
217 changed files with 937 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/proxy
View File

@ -28,27 +28,27 @@
# dictionary. Otherwise it is assumed that the module calls the grains
# function in a custom way and returns the data elsewhere
#
# Default to False for 2016.3 and 2016.11. Switch to True for Nitrogen.
# Default to False for 2016.3 and 2016.11. Switch to True for 2017.7.0.
# proxy_merge_grains_in_module: True
# If a proxymodule has a function called 'alive' returning a boolean
# flag reflecting the state of the connection with the remove device,
# when this option is set as True, a scheduled job on the proxy will
# try restarting the connection. The polling frequency depends on the
# next option, 'proxy_keep_alive_interval'. Added in Nitrogen.
# next option, 'proxy_keep_alive_interval'. Added in 2017.7.0.
# proxy_keep_alive: True
# The polling interval (in minutes) to check if the underlying connection
# with the remote device is still alive. This option requires
# 'proxy_keep_alive' to be configured as True and the proxymodule to
# implement the 'alive' function. Added in Nitrogen.
# implement the 'alive' function. Added in 2017.7.0.
# proxy_keep_alive_interval: 1
# By default, any proxy opens the connection with the remote device when
# initialized. Some proxymodules allow through this option to open/close
# the session per command. This requires the proxymodule to have this
# capability. Please consult the documentation to see if the proxy type
# used can be that flexible. Added in Nitrogen.
# used can be that flexible. Added in 2017.7.0.
# proxy_always_alive: True
# If multiple masters are specified in the 'master' setting, the default behavior

4
doc/ref/cli/salt-cp.rst
View File

@ -33,7 +33,7 @@ specified target expression.
minions. However, this requires the file to be located within one of the
fileserver directories.
.. versionchanged:: 2016.3.7,2016.11.6,Nitrogen
.. versionchanged:: 2016.3.7,2016.11.6,2017.7.0
Compression support added, disable with ``-n``. Also, if the destination
path ends in a path separator (i.e. ``/``, or ``\`` on Windows, the
desitination will be assumed to be a directory. Finally, recursion is now
@ -60,7 +60,7 @@ Options
Disable gzip compression.
.. versionadded:: 2016.3.7,2016.11.6,Nitrogen
.. versionadded:: 2016.3.7,2016.11.6,2017.7.0
See also
========

30
doc/ref/configuration/master.rst
View File

@ -248,7 +248,7 @@ each of Salt's module types such as ``runners``, ``output``, ``wheel``,
``extmod_whitelist/extmod_blacklist``
-------------------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
By using this dictionary, the modules that are synced to the master's extmod cache using `saltutil.sync_*` can be
limited. If nothing is set to a specific type, then all modules are accepted. To block all modules of a specific type,
@ -1742,9 +1742,9 @@ on a large number of minions.
.. conf_master:: fileserver_verify_config
``fileserver_verify_config``
------------------------------
----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``True``
@ -2259,7 +2259,7 @@ authenticate is protected by a passphrase.
``gitfs_refspecs``
~~~~~~~~~~~~~~~~~~
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']``
@ -2813,7 +2813,7 @@ configuration is the same as :conf_master:`file_roots`:
``on_demand_ext_pillar``
------------------------
.. versionadded:: 2016.3.6,2016.11.3,Nitrogen
.. versionadded:: 2016.3.6,2016.11.3,2017.7.0
Default: ``['libvirt', 'virtkey']``
@ -2841,7 +2841,7 @@ The external pillars permitted to be used on-demand using :py:func:`pillar.ext
``decrypt_pillar``
------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``[]``
@ -2863,7 +2863,7 @@ specified by :conf_master:`decrypt_pillar_default` will be used.
``decrypt_pillar_delimiter``
----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``:``
@ -2882,7 +2882,7 @@ The delimiter used to distinguish nested data structures in the
``decrypt_pillar_default``
--------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``gpg``
@ -2898,7 +2898,7 @@ pillar key in :conf_master:`decrypt_pillar`.
``decrypt_pillar_renderers``
----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``['gpg']``
@ -3222,7 +3222,7 @@ they were created by a different master.
``git_pillar_includes``
***********************
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``True``
@ -3353,7 +3353,7 @@ authenticate is protected by a passphrase.
``git_pillar_refspecs``
~~~~~~~~~~~~~~~~~~~~~~~
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']``
@ -3376,7 +3376,7 @@ configured both globally and for individual remotes.
``git_pillar_verify_config``
----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``True``
@ -3734,9 +3734,9 @@ check in with their lists of expected minions before giving up.
.. conf_master:: syndic_forward_all_events
``syndic_forward_all_events``
-------------------
-----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``False``
@ -4363,7 +4363,7 @@ authenticate is protected by a passphrase.
``winrepo_refspecs``
~~~~~~~~~~~~~~~~~~~~
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``['+refs/heads/*:refs/remotes/origin/*', '+refs/tags/*:refs/tags/*']``

16
doc/ref/configuration/minion.rst
View File

@ -1276,9 +1276,9 @@ below.
service: systemd
``extmod_whitelist/extmod_blacklist``
--------------------
-------------------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
By using this dictionary, the modules that are synced to the minion's extmod cache using `saltutil.sync_*` can be
limited. If nothing is set to a specific type, then all modules are accepted. To block all modules of a specific type,
@ -1747,7 +1747,7 @@ the pillar environments.
``on_demand_ext_pillar``
------------------------
.. versionadded:: 2016.3.6,2016.11.3,Nitrogen
.. versionadded:: 2016.3.6,2016.11.3,2017.7.0
Default: ``['libvirt', 'virtkey']``
@ -1776,7 +1776,7 @@ external pillars are permitted to be used on-demand using :py:func:`pillar.ext
``decrypt_pillar``
------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``[]``
@ -1798,7 +1798,7 @@ specified by :conf_minion:`decrypt_pillar_default` will be used.
``decrypt_pillar_delimiter``
----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``:``
@ -1817,7 +1817,7 @@ The delimiter used to distinguish nested data structures in the
``decrypt_pillar_default``
--------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``gpg``
@ -1833,7 +1833,7 @@ pillar key in :conf_minion:`decrypt_pillar`.
``decrypt_pillar_renderers``
----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``['gpg']``
@ -1864,7 +1864,7 @@ the environment setting, but for pillar instead of states.
``pillarenv_from_saltenv``
--------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``False``

10
doc/ref/configuration/proxy.rst
View File

@ -27,7 +27,7 @@ Proxy-specific Configuration Options
.. conf_proxy:: add_proxymodule_to_opts
``add_proxymodule_to_opts``
--------------------------
---------------------------
.. versionadded:: 2015.8.2
@ -49,7 +49,7 @@ Add the proxymodule LazyLoader object to opts.
.. versionadded:: 2016.3.0
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Default: ``True``
@ -68,7 +68,7 @@ function in a custom way and returns the data elsewhere.
``proxy_keep_alive``
--------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``True``
@ -86,7 +86,7 @@ otherwise the connection is considered alive.
``proxy_keep_alive_interval``
-----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``1``
@ -104,7 +104,7 @@ The frequency of keepalive checks, in minutes. It requires the
``proxy_always_alive``
----------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Default: ``True``

2
doc/ref/peer.rst
View File

@ -126,4 +126,4 @@ To match minions using other matchers, use ``tgt_type``:
# salt-call publish.publish 'webserv* and not G@os:Ubuntu' test.ping tgt_type='compound'
.. note::
In pre-Nitrogen releases, use ``expr_form`` instead of ``tgt_type``.
In pre-2017.7.0 releases, use ``expr_form`` instead of ``tgt_type``.

22
doc/ref/states/parallel.rst
View File

@ -2,8 +2,8 @@
Running States in Parallel
==========================
Introduced in Salt version Nitrogen it is now possible to run select states
in parallel. This is accomplished very easily by adding the `parallel: True`
Introduced in Salt version ``2017.7.0`` it is now possible to run select states
in parallel. This is accomplished very easily by adding the ``parallel: True``
option to your state declaration:
.. code_block:: yaml
@ -12,7 +12,7 @@ option to your state declaration:
service.running:
- parallel: True
Now `nginx` will be started in a seperate process from the normal state run
Now ``nginx`` will be started in a seperate process from the normal state run
and will therefore not block additional states.
Parallel States and Requisites
@ -40,16 +40,16 @@ Given this example:
cmd.run:
- parallel: True
The `sleep 10` will be started first, then the state system will block on
starting nginx until the `sleep 10` completes. Once nginx has been ensured to
be running then the `sleep 5` will start.
The ``sleep 10`` will be started first, then the state system will block on
starting nginx until the ``sleep 10`` completes. Once nginx has been ensured to
be running then the ``sleep 5`` will start.
This means that the order of evaluation of Salt States and requisites are
still honored, and given that in the above case, `parallel: True` does not
still honored, and given that in the above case, ``parallel: True`` does not
actually speed things up.
To run the above state much faster make sure that the `sleep 5` is evaluated
before the `nginx` state
To run the above state much faster make sure that the ``sleep 5`` is evaluated
before the ``nginx`` state
.. code_block:: yaml
@ -67,8 +67,8 @@ before the `nginx` state
- require:
- cmd: sleep 10
Now both of the sleep calls will be started in parallel and `nginx` will still
wait for the state it requires, but while it waits the `sleep 5` state will
Now both of the sleep calls will be started in parallel and ``nginx`` will still
wait for the state it requires, but while it waits the ``sleep 5`` state will
also complete.
Things to be Careful of

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

@ -517,7 +517,7 @@ inherit inherited options.
runas
~~~~~
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
The ``runas`` global option is used to set the user which will be used to run the command in the ``cmd.run`` module.
@ -849,7 +849,7 @@ this one, include a ``mod_run_check_cmd`` in the states file for the state.
Retrying States
===============
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
The retry option in a state allows it to be executed multiple times until a desired
result is obtained or the maximum number of attempts have been made.

22
doc/topics/cloud/gce.rst
View File

@ -15,9 +15,10 @@ at https://cloud.google.com.
Dependencies
============
* LibCloud >= 1.0.0
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
* A Google Cloud Platform account with Compute Engine enabled
* A registered Service Account for authorization
@ -226,7 +227,7 @@ Use this setting to define the subnetwork an instance will be created in.
This requires that the network your instance is created under has a mode of 'custom' or 'auto'.
Additionally, the subnetwork your instance is created under is associated with the location you provide.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
tags
----
@ -526,7 +527,7 @@ not possible to add/remove existing instances to a network.
salt-cloud -f create_network gce name=mynet cidr=10.10.10.0/24
salt-cloud -f create_network gce name=mynet mode=auto description=some optional info.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Destroy network
---------------
@ -546,7 +547,8 @@ Specify the network name to view information about the network.
salt-cloud -f show_network gce name=mynet
Create subnetwork
--------------
-----------------
New subnetworks require a name, region, and CIDR range.
Optionally, 'description' can be provided to add an extra note to your subnetwork.
New instances can be created and added to this subnetwork by setting the subnetwork name during create. It is
@ -557,10 +559,11 @@ not possible to add/remove existing instances to a subnetwork.
salt-cloud -f create_subnetwork gce name=mynet network=mynet region=us-central1 cidr=10.0.10.0/24
salt-cloud -f create_subnetwork gce name=mynet network=mynet region=us-central1 cidr=10.10.10.0/24 description=some info about my subnet.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Destroy subnetwork
---------------
------------------
Destroy a subnetwork by specifying the name and region. If a resource is currently using
the target subnetwork an exception will be raised.
@ -568,17 +571,18 @@ the target subnetwork an exception will be raised.
salt-cloud -f delete_subnetwork gce name=mynet region=us-central1
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Show subnetwork
------------
---------------
Specify the subnetwork name to view information about the subnetwork.
.. code-block:: bash
salt-cloud -f show_subnetwork gce name=mynet
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create address
--------------

2
doc/topics/cloud/map.rst
View File

@ -92,7 +92,7 @@ Any top level data element from your profile may be overridden in the map file:
- web2:
size: t2.nano
As of Salt Nitrogen, nested elements are merged, and can can be specified
As of Salt 2017.7.0, nested elements are merged, and can can be specified
individually without having to repeat the complete definition for each top
level data element. In this example a separate MAC is assigned to each VMware
instance while inheriting device parameters for for disk and network

2
doc/topics/event/master_events.rst
View File

@ -136,7 +136,7 @@ Runner Events
``state`` and ``function`` types, also includes a ``tgt_type`` value
which shows what kind of match (``glob``, ``pcre``, etc.) was used.
This value was named ``expr_form`` in the 2016.11 release cycle but has
been renamed to ``tgt_type`` in Nitrogen for consistency with other
been renamed to ``tgt_type`` in 2017.7.0 for consistency with other
events.
.. _event-master_presence:

116
doc/topics/jinja/index.rst
View File

@ -261,7 +261,7 @@ use ``yaml_encode`` or ``yaml_dquote``).
``to_bool``
-----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns the logical value of an element.
@ -289,7 +289,7 @@ Will be rendered as:
``exactly_n_true``
------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Tests that exactly N items in an iterable are "truthy" (neither None, False, nor 0).
@ -309,9 +309,9 @@ Returns:
.. jinja_ref:: exactly_one_true
``exactly_one_true``
------------------
--------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Tests that exactly one item in an iterable is "truthy" (neither None, False, nor 0).
@ -333,7 +333,7 @@ Returns:
``quote``
---------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Wraps a text around quoutes.
@ -343,7 +343,7 @@ Wraps a text around quoutes.
``regex_search``
----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Scan through string looking for a location where this regular expression
produces a match. Returns ``None`` in case there were no matches found
@ -364,9 +364,9 @@ Returns:
.. jinja_ref:: regex_match
``regex_match``
----------------
---------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
If zero or more characters at the beginning of string match this regular
expression, otherwise returns ``None``.
@ -389,7 +389,7 @@ Returns:
``uuid``
--------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return a UUID.
@ -411,7 +411,7 @@ Returns:
``is_list``
-----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return if an object is list.
@ -433,7 +433,7 @@ Returns:
``is_iter``
-----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return if an object is iterable.
@ -455,7 +455,7 @@ Returns:
``min``
-------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the minimum value from a list.
@ -477,7 +477,7 @@ Returns:
``max``
-------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns the maximum value from a list.
@ -499,7 +499,7 @@ Returns:
``avg``
-------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns the average value of the elements of a list
@ -521,7 +521,7 @@ Returns:
``union``
---------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the union of two lists.
@ -543,7 +543,7 @@ Returns:
``intersect``
-------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the intersection of two lists.
@ -565,7 +565,7 @@ Returns:
``difference``
--------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the difference of two lists.
@ -588,7 +588,7 @@ Returns:
``symmetric_difference``
------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the symmetric difference of two lists.
@ -610,7 +610,7 @@ Returns:
``is_sorted``
-------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return is an iterable object is already sorted.
@ -632,7 +632,7 @@ Returns:
``compare_lists``
-----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Compare two lists and return a dictionary with the changes.
@ -654,7 +654,7 @@ Returns:
``compare_dicts``
-----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Compare two dictionaries and return a dictionary with the changes.
@ -676,7 +676,7 @@ Returns:
``is_hex``
----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return True if the value is hexazecimal.
@ -700,7 +700,7 @@ Returns:
``contains_whitespace``
-----------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return True if a text contains whitespaces.
@ -724,7 +724,7 @@ Returns:
``substring_in_list``
---------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return is a substring is found in a list of string values.
@ -746,7 +746,7 @@ Returns:
``check_whitelist_blacklist``
-----------------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Check a whitelist and/or blacklist to see if the value matches it.
@ -769,7 +769,7 @@ Returns:
``date_format``
---------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Converts unix timestamp into human-readable string.
@ -793,7 +793,7 @@ Returns:
``str_to_num``
--------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Converts a string to its numerical value.
@ -815,7 +815,7 @@ Returns:
``to_bytes``
------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Converts string-type object to bytes.
@ -831,7 +831,7 @@ Example:
``json_decode_list``
--------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
JSON decodes as unicode, Jinja needs bytes.
@ -853,7 +853,7 @@ Returns:
``json_decode_dict``
--------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
JSON decodes as unicode, Jinja needs bytes.
@ -875,7 +875,7 @@ Returns:
``rand_str``
------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Generate a random string and applies a hash. Default hashing: md5.
@ -900,7 +900,7 @@ Returns:
``md5``
-------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the md5 digest of a string.
@ -922,7 +922,7 @@ Returns:
``sha256``
----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the sha256 digest of a string.
@ -944,7 +944,7 @@ Returns:
``sha512``
----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the sha512 digest of a string.
@ -966,7 +966,7 @@ Returns:
``base64_encode``
-----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Encode a string as base64.
@ -988,7 +988,7 @@ Returns:
``base64_decode``
-----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Decode a base64-encoded string.
@ -1008,7 +1008,7 @@ Returns:
``hmac``
--------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Verify a challenging hmac signature against a string / shared-secret. Returns
a boolean value.
@ -1031,7 +1031,7 @@ Returns:
``http_query``
--------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the HTTP reply object from a URL.
@ -1068,7 +1068,7 @@ The following networking-related filters are supported:
``is_ip``
---------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return if a string is a valid IP Address.
@ -1101,7 +1101,7 @@ Example - test if a string is a valid loopback IP address.
``is_ipv4``
-----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns if a string is a valid IPv4 address. Supports the same options
as ``is_ip``.
@ -1116,7 +1116,7 @@ as ``is_ip``.
``is_ipv6``
-----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns if a string is a valid IPv6 address. Supports the same options
as ``is_ip``.
@ -1131,7 +1131,7 @@ as ``is_ip``.
``ipaddr``
----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
From a list, returns only valid IP entries. Supports the same options
as ``is_ip``. The list can contains also IP interfaces/networks.
@ -1154,7 +1154,7 @@ Returns:
``ipv4``
--------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
From a list, returns only valid IPv4 entries. Supports the same options
as ``is_ip``. The list can contains also IP interfaces/networks.
@ -1177,7 +1177,7 @@ Returns:
``ipv6``
--------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
From a list, returns only valid IPv6 entries. Supports the same options
as ``is_ip``. The list can contains also IP interfaces/networks.
@ -1200,7 +1200,7 @@ Returns:
``network_hosts``
-----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the list of hosts within a networks.
@ -1222,7 +1222,7 @@ Returns:
``network_size``
----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the size of the network.
@ -1244,7 +1244,7 @@ Returns:
``gen_mac``
-----------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Generates a MAC address with the defined OUI prefix.
@ -1274,7 +1274,7 @@ Returns:
``mac_str_to_bytes``
--------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Converts a string representing a valid MAC address to bytes.
@ -1290,7 +1290,7 @@ Example:
``dns_check``
-------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the ip resolved by dns, but do not exit on failure, only raise an
exception. Obeys system preference for IPv4/6 address resolution.
@ -1313,9 +1313,9 @@ File filters
.. jinja_ref:: is_text_file
``is_text_file``
---------------
----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return if a file is text.
@ -1342,7 +1342,7 @@ Returns:
``is_binary_file``
------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return if a file is binary.
@ -1367,7 +1367,7 @@ Returns:
``is_empty_file``
-----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return if a file is empty.
@ -1389,7 +1389,7 @@ Returns:
``file_hashsum``
----------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the hashsum of a file.
@ -1411,7 +1411,7 @@ Returns:
``list_files``
--------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return a recursive list of files under a specific path.
@ -1437,7 +1437,7 @@ Returns:
``path_join``
-------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Joins absolute paths.
@ -1459,7 +1459,7 @@ Returns:
``which``
---------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Python clone of /usr/bin/which.
@ -1599,7 +1599,7 @@ in the current Jinja context.
Logs
----
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Yes, in Salt, one is able to debug a complex Jinja template using the logs.
For example, making the call:

2
doc/topics/mine/index.rst
View File

@ -225,5 +225,5 @@ Create the Jinja template in :file:`/srv/salt/haproxy_config`:
In the above example, ``server`` will be expanded to the ``minion_id``.
.. note::
The expr_form argument will be renamed to ``tgt_type`` in the Nitrogen
The expr_form argument will be renamed to ``tgt_type`` in the 2017.7.0
release of Salt.

4
doc/topics/pillar/index.rst
View File

@ -376,7 +376,7 @@ the ``testing`` environment, without modifying the in-memory pillar data.
this case would still restrict the states' pillar data to just that of the
``testing`` pillar environment.
Starting in the Nitrogen release, it is possible to pin the pillarenv to the
Starting in the 2017.7.0 release, it is possible to pin the pillarenv to the
effective saltenv, using the :conf_minion:`pillarenv_from_saltenv` minion
config option. When this is set to ``True``, if a specific saltenv is specified
when running states, the ``pillarenv`` will be the same. This essentially makes
@ -497,7 +497,7 @@ compilation.
Encrypted Pillar SLS
--------------------
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Consider the following pillar SLS file:

8
doc/topics/proxyminion/index.rst
View File

@ -36,7 +36,7 @@ or more minions.
See :ref:`Proxyminion Beacon <proxy-minion-beacon>` to help
with easy configuration and management of ``salt-proxy`` processes.
New in Nitrogen
New in 2017.7.0
---------------
The :conf_proxy:`proxy_merge_grains_in_module` configuration variable
@ -128,7 +128,7 @@ will be executed on proxy-minion startup and its contents will be merged with
the rest of the proxy's grains. Since older proxy-minions might have used other
methods to call such a function and add its results to grains, this is config-gated
by a new proxy configuration option called ``proxy_merge_grains_in_module``. This
defaults to ``True`` in the **Nitrogen** release.
defaults to ``True`` in the **2017.7.0** release.
New in 2015.8.2
@ -377,7 +377,7 @@ the ``proxy_keep_alive_interval`` option, in minutes.
the standard install directories for grains, grains can be computed and
returned by this function. This function will be called automatically
if ``proxy_merge_grains_in_module`` is set to ``True`` in /etc/salt/proxy.
This variable defaults to ``True`` in the release code-named *Nitrogen*.
This variable defaults to ``True`` in the release code-named *2017.7.0*.
Pre 2015.8 the proxymodule also must have an ``id()`` function. 2015.8 and following don't use
this function because the proxy's id is required on the command line.
@ -621,7 +621,7 @@ the proxy and grains directories.
This function will only be called automatically if the configuration variable ``proxy_merge_grains_in_module``
is set to True in the proxy configuration file (default ``/etc/salt/proxy``). This
variable defaults to ``True`` in the release code-named *Nitrogen*.
variable defaults to ``True`` in the release code-named *2017.7.0*.
.. code: python::

2
doc/topics/reactor/index.rst
View File

@ -396,7 +396,7 @@ Use the ``tgt_type`` argument to specify a matcher:
.. note::
The ``tgt_type`` argument was named ``expr_form`` in releases prior to
Nitrogen (2016.11.x and earlier).
2017.7.0 (2016.11.x and earlier).
Any other parameters in the :py:meth:`LocalClient().cmd()
<salt.client.LocalClient.cmd>` method can be specified as well.

2
doc/topics/releases/2015.8.0.rst
View File

@ -231,7 +231,7 @@ Deprecations
- The use of ``provider`` in Salt Cloud provider files to define cloud drivers
has been deprecated in favor of using ``driver``. Both terms will work until
the Nitrogen release of Salt. Example provider file:
the 2017.7.0 release of Salt. Example provider file:
.. code-block:: yaml

2
doc/topics/releases/2016.11.0.rst
View File

@ -561,7 +561,7 @@ General Deprecations
- If ``env`` (or ``__env__``) is supplied as a keyword argument to a function
that also accepts arbitrary keyword arguments, then a new warning informs the
user that ``env`` is no longer used if it is found. This new warning will be
removed in Salt Nitrogen.
removed in Salt 2017.7.0.
.. code-block:: python

2
doc/topics/releases/2016.3.0.rst
View File

@ -274,7 +274,7 @@ Module Changes
:mod:`apache_site state module <salt.states.apache_site>`: the ``enable`` and
``disable`` functions were renamed to ``enabled`` and ``disabled``,
respectively. In :pull:`33562`, these functions were readded and properly
deprecated and will be removed in Salt Nitrogen. This fix will be available
deprecated and will be removed in Salt 2017.7.0. This fix will be available
in 2016.3.1. As a workaround, try
.. code-block:: sls

16
doc/topics/releases/nitrogen.rst → doc/topics/releases/2017.7.0.rst
View File

@ -1,8 +1,8 @@
:orphan:
.. _release-2017-7-0:
======================================
Salt Release Notes - Codename Nitrogen
======================================
===============================================
Salt 2017.7.0 Release Notes - Codename Nitrogen
===============================================
States Added for Management of systemd Unit Masking
===================================================
@ -272,7 +272,7 @@ Jinja
Filters
-------
New filters in Nitrogen:
New filters in 2017.7.0:
- :jinja_ref:`to_bool`
- :jinja_ref:`exactly_n_true`
@ -365,7 +365,7 @@ have been improved, enhanced and widenened in scope:
- Proxy keepalive: due to external factors, the connection with the remote
device can be dropped, e.g.: packet loss, idle time (no commands issued
within a couple of minutes or seconds), or simply the device decides to kill
the process. In Nitrogen we have introduced the functionality to re-establish
the process. In 2017.7.0 we have introduced the functionality to re-establish
the connection. One can disable this feature through the
:conf_proxy:`proxy_keep_alive` option and adjust the polling frequency
speciying a custom value for :conf_proxy:`proxy_keep_alive_interval`,
@ -520,7 +520,7 @@ documentation for :ref:`skip_translate
.. note::
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 replaced. The changes may
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 when
@ -748,7 +748,7 @@ The ``htpasswd`` execution module had the following function removed:
- ``useradd_all``: Please use ``useradd`` instead.
The ``img`` execution module has been removed. All of its associated functions
were marked for removal in the Nitrogen release. The functions removed in this
were marked for removal in the 2017.7.0 release. The functions removed in this
module are mapped as follows:
- ``mount_image``/``mnt_image``: Please use ``mount.mount`` instead.

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

@ -20,6 +20,7 @@ Previous Releases
:maxdepth: 1
:glob:
2017.7.*
2016.11.*
2016.3.*
2015.8.*

25
doc/topics/releases/version_numbers.rst
View File

@ -11,9 +11,11 @@ format ``YYYY.MM.R``. The year (``YYYY``) and month (``MM``) reflect when the
release was created. The bugfix release number (``R``) increments within that
feature release.
.. note:: Prior to the ``2014.1.0`` release, the typical semantic versioning was
still being used. Because of the rolling nature of the project, this did not
make sense. The ``0.17`` release was the last of that style.
.. note::
Prior to the ``2014.1.0`` release, the typical semantic versioning was
still being used. Because of the rolling nature of the project, this did not
make sense. The ``0.17`` release was the last of that style.
Code Names
----------
@ -31,8 +33,9 @@ Assigned codenames:
- Beryllium: ``2015.8.0``
- Boron: ``2016.3.0``
- Carbon: ``2016.11.0``
- Nitrogen: ``TBD``
- Nitrogen: ``2017.7.0``
- Oxygen: ``TBD``
- Fluorine: ``TBD``
Example
-------
@ -49,10 +52,12 @@ code name and the process repeats itself.
Version numbers, Git and salt --version
-------
---------------------------------------
The salt version, for programmers, is based on `git describe` and presented to end-users with `salt --version`.
Example arguments for `git checkout`
Example arguments for `git checkout`:
+------------+----------------------------------------------------------------------------+
| Argument | Comment |
+============+============================================================================+
@ -68,7 +73,8 @@ Example arguments for `git checkout`
Further reading on `release branch and develop branch
<https://docs.saltstack.com/en/latest/topics/development/contributing.html#which-salt-branch>`_.
Influence of the `git checkout` argument on `git describe`
Influence of the `git checkout` argument on `git describe`:
+------------+----------------------------+-----------------------------------------------+
| Checkout | Describe | Comment |
+============+============================+===============================================+
@ -80,10 +86,9 @@ Influence of the `git checkout` argument on `git describe`
+------------+----------------------------+-----------------------------------------------+
| develop | v2016.11.1-1741-g10d5dec | Commit of most recent tag in develop |
+------------+----------------------------+-----------------------------------------------+
Some details of v2016.11.1-220-g9a1550d (from `git describe` after `git checkout 2016.11`)
Some details of v2016.11.1-220-g9a1550d (from `git describe` after `git checkout 2016.11`):
+---------------+-------------------------------------------------------------------------+
| Part | Comment |
+===============+=========================================================================+

2
doc/topics/ssh/index.rst
View File

@ -112,7 +112,7 @@ Calling Salt SSH
.. note:: ``salt-ssh`` on systems with Python 3.x
Salt, before the Nitrogen release, does not support Python 3.x which is the
Salt, before the 2017.7.0 release, does not support Python 3.x which is the
default on for example the popular 16.04 LTS release of Ubuntu. An easy
workaround for this scenario is to use the ``-r`` option similar to the
example above:

2
doc/topics/targeting/nodegroups.rst
View File

@ -28,7 +28,7 @@ nodegroups. Here's an example nodegroup configuration within
group2 is matching specific grains. See the :ref:`compound matchers
<targeting-compound>` documentation for more details.
As of the Nitrogen release of Salt, group names can also be prepended with
As of the 2017.7.0 release of Salt, group names can also be prepended with
a dash. This brings the usage in line with many other areas of Salt. For
example:

4
doc/topics/tutorials/gitfs.rst
View File

@ -329,7 +329,7 @@ configured gitfs remotes):
* :conf_master:`gitfs_pubkey` (**pygit2 only**, new in 2014.7.0)
* :conf_master:`gitfs_privkey` (**pygit2 only**, new in 2014.7.0)
* :conf_master:`gitfs_passphrase` (**pygit2 only**, new in 2014.7.0)
* :conf_master:`gitfs_refspecs` (new in Nitrogen)
* :conf_master:`gitfs_refspecs` (new in 2017.7.0)
.. note::
pygit2 only supports disabling SSL verification in versions 0.23.2 and
@ -471,7 +471,7 @@ Given the above configuration, the following is true:
Custom Refspecs
===============
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
GitFS will by default fetch remote branches and tags. However, sometimes it can
be useful to fetch custom refs (such as those created for `GitHub pull

2
pkg/windows/buildenv/salt-call.bat
View File

@ -8,4 +8,6 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-call
:: Launch Script
"%Python%" "%Script%" %*

2
pkg/windows/buildenv/salt-cp.bat
View File

@ -8,4 +8,6 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-cp
:: Launch Script
"%Python%" "%Script%" %*

13
pkg/windows/buildenv/salt-key.bat Normal file
View File

@ -0,0 +1,13 @@
@ echo off
:: Script for invoking salt-key
:: Accepts all parameters that salt-key accepts
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-key
:: Launch Script
"%Python%" "%Script%" %*

13
pkg/windows/buildenv/salt-master.bat Normal file
View File

@ -0,0 +1,13 @@
@ echo off
:: Script for starting the Salt-Master
:: Accepts all parameters that Salt-Master accepts
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-master
:: Launch Script
"%Python%" "%Script%" %*

3
pkg/windows/buildenv/salt-minion-debug.bat
View File

@ -8,6 +8,9 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-minion
:: Stop the Salt Minion service
net stop salt-minion
:: Launch Script
"%Python%" "%Script%" -l debug

3
pkg/windows/buildenv/salt-minion-start-service.bat
View File

@ -1 +1,2 @@
net start salt-minion
:: Start the Salt Minion service
net start salt-minion

2
pkg/windows/buildenv/salt-minion.bat
View File

@ -8,4 +8,6 @@ Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-minion
:: Launch Script
"%Python%" "%Script%" %*

13
pkg/windows/buildenv/salt-run.bat Normal file
View File

@ -0,0 +1,13 @@
@ echo off
:: Script for invoking salt-run
:: Accepts all parameters that salt-run accepts
:: Define Variables
Set SaltDir=%~dp0
Set SaltDir=%SaltDir:~0,-1%
Set Python=%SaltDir%\bin\python.exe
Set Script=%SaltDir%\bin\Scripts\salt-run
:: Launch Script
"%Python%" "%Script%" %*

2
salt/beacons/log.py
View File

@ -2,7 +2,7 @@
'''
Beacon to fire events at specific log messages.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''

2
salt/cache/redis_cache.py vendored
View File

@ -5,7 +5,7 @@ Redis
Redis plugin for the Salt caching subsystem.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
As Redis provides a simple mechanism for very fast key-value store,
in order to privde the necessary features for the Salt

2
salt/client/__init__.py
View File

@ -674,7 +674,7 @@ class LocalClient(object):
* ``compound`` - Pass a compound match string
* ``ipcidr`` - Match based on Subnet (CIDR notation) or IPv4 address.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Renamed from ``expr_form`` to ``tgt_type``
:param ret: The returner to use. The value passed can be single

2
salt/client/ssh/client.py
View File

@ -224,7 +224,7 @@ class SSHClient(object):
>>> sshclient.cmd_subset('*', 'test.ping', sub=1)
{'jerry': True}
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
if 'expr_form' in kwargs:
salt.utils.warn_until(

2
salt/client/ssh/wrapper/publish.py
View File

@ -131,7 +131,7 @@ def publish(tgt,
- glob
- pcre
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
The ``expr_form`` argument has been renamed to ``tgt_type``, earlier
releases must use ``expr_form``.

12
salt/cloud/clouds/cloudstack.py
View File

@ -33,14 +33,20 @@ import salt.config as config
from salt.cloud.libcloudfuncs import * # pylint: disable=redefined-builtin,wildcard-import,unused-wildcard-import
from salt.utils import namespaced_function
from salt.exceptions import SaltCloudSystemExit
from salt.utils.versions import LooseVersion as _LooseVersion
# CloudStackNetwork will be needed during creation of a new node
# pylint: disable=import-error
try:
from libcloud.compute.drivers.cloudstack import CloudStackNetwork
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
# This work-around for Issue #32743 is no longer needed for libcloud >= 1.4.0.
# However, older versions of libcloud must still be supported with this work-around.
# This work-around can be removed when the required minimum version of libcloud is
# 2.0.0 (See PR #40837 - which is implemented in Salt Oxygen).
if _LooseVersion(libcloud.__version__) < _LooseVersion('1.4.0'):
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
HAS_LIBS = True
except ImportError:
HAS_LIBS = False

14
salt/cloud/clouds/dimensiondata.py
View File

@ -27,9 +27,11 @@ from __future__ import absolute_import
import logging
import socket
import pprint
from salt.utils.versions import LooseVersion as _LooseVersion
# Import libcloud
try:
import libcloud
from libcloud.compute.base import NodeState
from libcloud.compute.base import NodeAuthPassword
from libcloud.compute.types import Provider
@ -37,9 +39,15 @@ try:
from libcloud.loadbalancer.base import Member
from libcloud.loadbalancer.types import Provider as Provider_lb
from libcloud.loadbalancer.providers import get_driver as get_driver_lb
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
# This work-around for Issue #32743 is no longer needed for libcloud >= 1.4.0.
# However, older versions of libcloud must still be supported with this work-around.
# This work-around can be removed when the required minimum version of libcloud is
# 2.0.0 (See PR #40837 - which is implemented in Salt Oxygen).
if _LooseVersion(libcloud.__version__) < _LooseVersion('1.4.0'):
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
HAS_LIBCLOUD = True
except ImportError:
HAS_LIBCLOUD = False

41
salt/cloud/clouds/ec2.py
View File

@ -4020,7 +4020,46 @@ def volume_create(**kwargs):
def create_volume(kwargs=None, call=None, wait_to_finish=False):
'''
Create a volume
Create a volume.
zone
The availability zone used to create the volume. Required. String.
size
The size of the volume, in GiBs. Defaults to ``10``. Integer.
snapshot
The snapshot-id from which to create the volume. Integer.
type
The volume type. This can be gp2 for General Purpose SSD, io1 for Provisioned
IOPS SSD, st1 for Throughput Optimized HDD, sc1 for Cold HDD, or standard for
Magnetic volumes. String.
iops
The number of I/O operations per second (IOPS) to provision for the volume,
with a maximum ratio of 50 IOPS/GiB. Only valid for Provisioned IOPS SSD
volumes. Integer.
This option will only be set if ``type`` is also specified as ``io1``.
encrypted
Specifies whether the volume will be encrypted. Boolean.
If ``snapshot`` is also given in the list of kwargs, then this value is ignored
since volumes that are created from encrypted snapshots are also automatically
encrypted.
tags
The tags to apply to the volume during creation. Dictionary.
call
The ``create_volume`` function must be called with ``-f`` or ``--function``.
String.
wait_to_finish
Whether or not to wait for the volume to be available. Boolean. Defaults to
``False``.
CLI Examples:

29
salt/cloud/clouds/gce.py
View File

@ -54,10 +54,12 @@ import pprint
import logging
import msgpack
from ast import literal_eval
from salt.utils.versions import LooseVersion as _LooseVersion
# Import 3rd-party libs
# pylint: disable=import-error
try:
import libcloud
from libcloud.compute.types import Provider
from libcloud.compute.providers import get_driver
from libcloud.loadbalancer.types import Provider as Provider_lb
@ -66,9 +68,14 @@ try:
ResourceInUseError,
ResourceNotFoundError,
)
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
# This work-around for Issue #32743 is no longer needed for libcloud >= 1.4.0.
# However, older versions of libcloud must still be supported with this work-around.
# This work-around can be removed when the required minimum version of libcloud is
# 2.0.0 (See PR #40837 - which is implemented in Salt Oxygen).
if _LooseVersion(libcloud.__version__) < _LooseVersion('1.4.0'):
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
HAS_LIBCLOUD = True
except ImportError:
HAS_LIBCLOUD = False
@ -555,7 +562,7 @@ def __get_ssh_credentials(vm_):
def create_network(kwargs=None, call=None):
'''
... versionchanged:: Nitrogen
... versionchanged:: 2017.7.0
Create a GCE network. Must specify name and cidr.
CLI Example:
@ -706,7 +713,7 @@ def show_network(kwargs=None, call=None):
def create_subnetwork(kwargs=None, call=None):
'''
... versionadded:: Nitrogen
... versionadded:: 2017.7.0
Create a GCE Subnetwork. Must specify name, cidr, network, and region.
CLI Example:
@ -788,7 +795,7 @@ def create_subnetwork(kwargs=None, call=None):
def delete_subnetwork(kwargs=None, call=None):
'''
... versionadded:: Nitrogen
... versionadded:: 2017.7.0
Delete a GCE Subnetwork. Must specify name and region.
CLI Example:
@ -856,7 +863,7 @@ def delete_subnetwork(kwargs=None, call=None):
def show_subnetwork(kwargs=None, call=None):
'''
... versionadded:: Nitrogen
... versionadded:: 2017.7.0
Show details of an existing GCE Subnetwork. Must specify name and region.
CLI Example:
@ -2165,7 +2172,7 @@ def start(vm_name, call=None):
'''
Call GCE 'start on the instance.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -2209,7 +2216,7 @@ def stop(vm_name, call=None):
'''
Call GCE 'stop' on the instance.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -2385,7 +2392,7 @@ def create_attach_volumes(name, kwargs, call=None):
Volumes are attached in the order in which they are given, thus on a new
node the first volume will be /dev/sdb, the second /dev/sdc, and so on.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
if call != 'action':
raise SaltCloudSystemExit(
@ -2418,7 +2425,7 @@ def request_instance(vm_):
'''
Request a single GCE instance from a data dict.
.. versionchanged: Nitrogen
.. versionchanged: 2017.7.0
'''
if not GCE_VM_NAME_REGEX.match(vm_['name']):
raise SaltCloudSystemExit(

31
salt/cloud/clouds/nova.py
View File

@ -711,14 +711,29 @@ def request_instance(vm_=None, call=None):
search_global=False,
default={})
if floating_ip_conf.get('auto_assign', False):
pool = floating_ip_conf.get('pool', 'public')
floating_ip = None
for fl_ip, opts in six.iteritems(conn.floating_ip_list()):
if opts['fixed_ip'] is None and opts['pool'] == pool:
floating_ip = fl_ip
break
if floating_ip is None:
floating_ip = conn.floating_ip_create(pool)['ip']
if floating_ip_conf.get('ip_address', None) is not None:
ip_address = floating_ip_conf.get('ip_address', None)
try:
fl_ip_dict = conn.floating_ip_show(ip_address)
floating_ip = fl_ip_dict['ip']
except Exception as err:
raise SaltCloudSystemExit(
'Error assigning floating_ip for {0} on Nova\n\n'
'The following exception was thrown by libcloud when trying to '
'assign a floating ip: {1}\n'.format(
vm_['name'], err
)
)
else:
pool = floating_ip_conf.get('pool', 'public')
for fl_ip, opts in six.iteritems(conn.floating_ip_list()):
if opts['fixed_ip'] is None and opts['pool'] == pool:
floating_ip = fl_ip
break
if floating_ip is None:
floating_ip = conn.floating_ip_create(pool)['ip']
def __query_node_data(vm_):
try:
@ -765,7 +780,7 @@ def request_instance(vm_=None, call=None):
raise SaltCloudSystemExit(
'Error assigning floating_ip for {0} on Nova\n\n'
'The following exception was thrown by libcloud when trying to '
'assing a floating ip: {1}\n'.format(
'assign a floating ip: {1}\n'.format(
vm_['name'], exc
)
)

13
salt/cloud/clouds/openstack.py
View File

@ -143,9 +143,11 @@ import os
import logging
import socket
import pprint
from salt.utils.versions import LooseVersion as _LooseVersion
# Import libcloud
try:
import libcloud
from libcloud.compute.base import NodeState
HAS_LIBCLOUD = True
except ImportError:
@ -156,9 +158,14 @@ HAS014 = False
try:
from libcloud.compute.drivers.openstack import OpenStackNetwork
from libcloud.compute.drivers.openstack import OpenStack_1_1_FloatingIpPool
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
# This work-around for Issue #32743 is no longer needed for libcloud >= 1.4.0.
# However, older versions of libcloud must still be supported with this work-around.
# This work-around can be removed when the required minimum version of libcloud is
# 2.0.0 (See PR #40837 - which is implemented in Salt Oxygen).
if _LooseVersion(libcloud.__version__) < _LooseVersion('1.4.0'):
# See https://github.com/saltstack/salt/issues/32743
import libcloud.security
libcloud.security.CA_CERTS_PATH.append('/etc/ssl/certs/YaST-CA.pem')
HAS014 = True
except Exception:
pass

2
salt/config/__init__.py
View File

@ -971,7 +971,7 @@ VALID_OPTS = {
# dictionary. Otherwise it is assumed that the module calls the grains
# function in a custom way and returns the data elsewhere
#
# Default to False for 2016.3 and 2016.11. Switch to True for Nitrogen
# Default to False for 2016.3 and 2016.11. Switch to True for 2017.7.0
'proxy_merge_grains_in_module': bool,
# Command to use to restart salt-minion

6
salt/engines/hipchat.py
View File

@ -219,7 +219,7 @@ def start(token,
api_url: ``https://api.hipchat.com``
The URL to the HipChat API.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
max_rooms: ``1000``
Maximum number of rooms allowed to fetch. If set to 0,
@ -237,13 +237,13 @@ def start(token,
This can be overriden when executing a command, using the ``--out-type`` argument.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
outputter: ``nested``
The format to display the data, using the outputters available on the CLI.
This argument can also be overriden when executing a command, using the ``--out`` option.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
HipChat Example:

2
salt/engines/ircbot.py
View File

@ -2,7 +2,7 @@
'''
IRC Bot engine
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Example Configuration

2
salt/engines/junos_syslog.py
View File

@ -3,7 +3,7 @@
Junos Syslog Engine
==========================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: pyparsing, twisted

2
salt/engines/napalm_syslog.py
View File

@ -3,7 +3,7 @@
NAPALM syslog engine
====================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
An engine that takes syslog messages structured in
OpenConfig_ or IETF format

2
salt/engines/slack.py
View File

@ -56,7 +56,7 @@ the saltmaster's minion pillar.
:configuration: Example configuration using the "default" group and a non-default group and a pillar that will be merged in
If the user is '*' (without the quotes) then the group's users or commands will match all users as appropriate
.. versionadded: Nitrogen
.. versionadded: 2017.7.0
engines:
slack:

2
salt/engines/stalekey.py
View File

@ -6,7 +6,7 @@ connected for a certain period of time.
Requires that the minion_data_cache option be enabled.
.. versionadded: Nitrogen
.. versionadded: 2017.7.0
:configuration:

2
salt/grains/core.py
View File

@ -517,7 +517,7 @@ def _virtual(osdata):
'\'virtual\' grain.'
)
# Check if enable_lspci is True or False
if __opts__.get('enable_lspci', True) is False:
if __opts__.get('enable_lspci', True) is True:
# /proc/bus/pci does not exists, lspci will fail
if os.path.exists('/proc/bus/pci'):
_cmds += ['lspci']

2
salt/grains/metadata.py
View File

@ -2,7 +2,7 @@
'''
Grains from cloud metadata servers at 169.254.169.254
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: requests

8
salt/grains/napalm.py
View File

@ -266,7 +266,7 @@ def username(proxy=None):
'''
Return the username.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example - select all devices using `foobar` as username for connection:
@ -331,7 +331,7 @@ def host(proxy=None):
while ``hostname`` provides the hostname as configured on the device.
They are not necessarily the same.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -374,7 +374,7 @@ def host_dns(proxy=None):
napalm_host_dns_grain: true
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -430,7 +430,7 @@ def optional_args(proxy=None):
Sensible data will not be returned.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example - select all devices connecting via port 1234:

2
salt/modules/apk.py
View File

@ -8,7 +8,7 @@ Support for apk
*'pkg.install' is not available*), see :ref:`here
<module-provider-override>`.
.. versionadded: Nitrogen
.. versionadded: 2017.7.0
'''
from __future__ import absolute_import

8
salt/modules/aptpkg.py
View File

@ -1597,7 +1597,7 @@ def _consolidate_repo_sources(sources):
def list_repo_pkgs(*args, **kwargs): # pylint: disable=unused-import
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns all available packages. Optionally, package names (and name globs)
can be passed and the results will be filtered to packages matching those
@ -1878,7 +1878,7 @@ def del_repo(repo, **kwargs):
def _convert_if_int(value):
'''
.. versionadded:: nitrogen
.. versionadded:: 2017.7.0
Convert to an int if necessary.
@ -1896,7 +1896,7 @@ def _convert_if_int(value):
def get_repo_keys():
'''
.. versionadded:: nitrogen
.. versionadded:: 2017.7.0
List known repo key details.
@ -1968,7 +1968,7 @@ def get_repo_keys():
def add_repo_key(path=None, text=None, keyserver=None, keyid=None, saltenv='base'):
'''
.. versionadded:: nitrogen
.. versionadded:: 2017.7.0
Add a repo key using ``apt-key add``.

16
salt/modules/archive.py
View File

@ -481,7 +481,7 @@ def tar(options, tarfile, sources=None, dest=None,
Comma delimited list of files to **pack** into the tarfile. Can also be
passed as a Python list.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Globbing is now supported for this argument
dest
@ -506,7 +506,7 @@ def tar(options, tarfile, sources=None, dest=None,
# Create a tarfile
salt '*' archive.tar -cjvf /tmp/tarfile.tar.bz2 /tmp/file_1,/tmp/file_2
# Create a tarfile using globbing (Nitrogen and later)
# Create a tarfile using globbing (2017.7.0 and later)
salt '*' archive.tar -cjvf /tmp/tarfile.tar.bz2 '/tmp/file_*'
# Unpack a tarfile
salt '*' archive.tar xf foo.tar dest=/target/directory
@ -632,7 +632,7 @@ def cmd_zip(zip_file, sources, template=None, cwd=None, runas=None):
Comma-separated list of sources to include in the zip file. Sources can
also be passed in a Python list.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Globbing is now supported for this argument
template : None
@ -669,7 +669,7 @@ def cmd_zip(zip_file, sources, template=None, cwd=None, runas=None):
.. code-block:: bash
salt '*' archive.cmd_zip /tmp/zipfile.zip /tmp/sourcefile1,/tmp/sourcefile2
# Globbing for sources (Nitrogen and later)
# Globbing for sources (2017.7.0 and later)
salt '*' archive.cmd_zip /tmp/zipfile.zip '/tmp/sourcefile*'
'''
cmd = ['zip', '-r']
@ -701,7 +701,7 @@ def zip_(zip_file, sources, template=None, cwd=None, runas=None):
Comma-separated list of sources to include in the zip file. Sources can
also be passed in a Python list.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Globbing is now supported for this argument
template : None
@ -734,7 +734,7 @@ def zip_(zip_file, sources, template=None, cwd=None, runas=None):
.. code-block:: bash
salt '*' archive.zip /tmp/zipfile.zip /tmp/sourcefile1,/tmp/sourcefile2
# Globbing for sources (Nitrogen and later)
# Globbing for sources (2017.7.0 and later)
salt '*' archive.zip /tmp/zipfile.zip '/tmp/sourcefile*'
'''
if runas:
@ -1163,7 +1163,7 @@ def rar(rarfile, sources, template=None, cwd=None, runas=None):
Comma-separated list of sources to include in the rar file. Sources can
also be passed in a Python list.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Globbing is now supported for this argument
cwd : None
@ -1188,7 +1188,7 @@ def rar(rarfile, sources, template=None, cwd=None, runas=None):
.. code-block:: bash
salt '*' archive.rar /tmp/rarfile.rar /tmp/sourcefile1,/tmp/sourcefile2
# Globbing for sources (Nitrogen and later)
# Globbing for sources (2017.7.0 and later)
salt '*' archive.rar /tmp/rarfile.rar '/tmp/sourcefile*'
'''
cmd = ['rar', 'a', '-idp', '{0}'.format(rarfile)]

2
salt/modules/at.py
View File

@ -7,7 +7,7 @@ easily tag jobs.
:platform: linux,openbsd,freebsd
.. versionchanged:: nitrogen
.. versionchanged:: 2017.7.0
'''
from __future__ import absolute_import

2
salt/modules/at_solaris.py
View File

@ -10,7 +10,7 @@ Wrapper for at(1) on Solaris-like systems
:maturity: new
:platform: solaris,illumos,smartso
.. versionadded:: nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import absolute_import

2
salt/modules/boto3_elasticache.py
View File

@ -3,7 +3,7 @@
Execution module for Amazon Elasticache using boto3
===================================================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:configuration: This module accepts explicit elasticache credentials but can
also utilize IAM roles assigned to the instance through Instance Profiles.

2
salt/modules/boto3_route53.py
View File

@ -2,7 +2,7 @@
'''
Execution module for Amazon Route53 written against Boto 3
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:configuration: This module accepts explicit route53 credentials but can also
utilize IAM roles assigned to the instance through Instance Profiles.

12
salt/modules/boto_apigateway.py
View File

@ -1408,7 +1408,7 @@ def describe_usage_plans(name=None, plan_id=None, region=None, key=None, keyid=N
'''
Returns a list of existing usage plans, optionally filtered to match a given plan name
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -1460,7 +1460,7 @@ def create_usage_plan(name, description=None, throttle=None, quota=None, region=
'''
Creates a new usage plan with throttling and quotas optionally applied
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
name
Name of the usage plan
@ -1518,7 +1518,7 @@ def update_usage_plan(plan_id, throttle=None, quota=None, region=None, key=None,
'''
Updates an existing usage plan with throttling and quotas
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
plan_id
Id of the created usage plan
@ -1592,7 +1592,7 @@ def delete_usage_plan(plan_id, region=None, key=None, keyid=None, profile=None):
'''
Deletes usage plan identified by plan_id
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -1655,7 +1655,7 @@ def attach_usage_plan_to_apis(plan_id, apis, region=None, key=None, keyid=None,
'''
Attaches given usage plan to each of the apis provided in a list of apiId and stage values
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
apis
a list of dictionaries, where each dictionary contains the following:
@ -1680,7 +1680,7 @@ def detach_usage_plan_from_apis(plan_id, apis, region=None, key=None, keyid=None
'''
Detaches given usage plan from each of the apis provided in a list of apiId and stage value
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
apis
a list of dictionaries, where each dictionary contains the following:

4
salt/modules/boto_ec2.py
View File

@ -450,7 +450,7 @@ def assign_private_ip_addresses(network_interface_name=None, network_interface_i
salt myminion boto_ec2.assign_private_ip_addresses network_interface_name=my_eni private_ip_addresses=private_ip
salt myminion boto_ec2.assign_private_ip_addresses network_interface_name=my_eni secondary_private_ip_address_count=2
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
if not salt.utils.exactly_one((network_interface_name,
network_interface_id)):
@ -504,7 +504,7 @@ def unassign_private_ip_addresses(network_interface_name=None, network_interface
salt myminion boto_ec2.unassign_private_ip_addresses network_interface_name=my_eni private_ip_addresses=private_ip
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
if not salt.utils.exactly_one((network_interface_name,
network_interface_id)):

2
salt/modules/boto_efs.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon EFS
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:configuration: This module accepts explicit EFS credentials but can also
utilize IAM roles assigned to the instance through Instance Profiles or

2
salt/modules/boto_kinesis.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon Kinesis
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:configuration: This module accepts explicit Kinesis credentials but can also
utilize IAM roles assigned to the instance trough Instance Profiles.

4
salt/modules/boto_lambda.py
View File

@ -239,7 +239,7 @@ def create_function(FunctionName, Runtime, Role, Handler, ZipFile=None,
}
}
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns {created: true} if the function was created and returns
{created: False} if the function was not created.
@ -384,7 +384,7 @@ def update_function_config(FunctionName, Role=None, Handler=None,
}
}
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns {updated: true} if the function was updated and returns
{updated: False} if the function was not updated.

7
salt/modules/boto_vpc.py
View File

@ -4,6 +4,11 @@ Connection module for Amazon VPC
.. versionadded:: 2014.7.0
:depends:
- boto >= 2.8.0
- boto3 >= 1.2.6
:configuration: This module accepts explicit VPC credentials but can also
utilize IAM roles assigned to the instance through Instance Profiles.
Dynamic credentials are then automatically obtained from AWS API and no
@ -69,8 +74,6 @@ Connection module for Amazon VPC
error:
message: error message
:depends: boto
.. versionadded:: 2016.11.0
Functions to request, accept, delete and describe VPC peering connections.

2
salt/modules/bower.py
View File

@ -219,7 +219,7 @@ def list_(dir, runas=None, env=None):
def prune(dir, runas=None, env=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Remove extraneous local Bower packages, i.e. those not referenced in bower.json

3
salt/modules/capirca_acl.py
View File

@ -5,7 +5,7 @@ Capirca ACL
Generate ACL (firewall) configuration for network devices.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:codeauthor: Mircea Ulinic <mircea@cloudflare.com> & Robert Ankeny <robankeny@google.com>
:maturity: new
@ -108,6 +108,7 @@ _TERM_FIELDS = {
'fragment_offset': None,
'hop_limit': None,
'icmp_type': [],
'icmp_code': None,
'ether_type': [],
'traffic_class_count': None,
'traffic_type': [],

4
salt/modules/chocolatey.py
View File

@ -257,7 +257,7 @@ def list_(narrow=None,
Display only packages that match ``narrow`` exactly. Default is
False.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns:
dict: A dictionary of results.
@ -422,7 +422,7 @@ def install(name,
Allow multiple 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
no_progress
Do not show download progress percentages. Defaults to False.

26
salt/modules/dockermod.py
View File

@ -3,7 +3,7 @@
Management of Docker Containers
.. versionadded:: 2015.8.0
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
This module has replaced the legacy docker execution module.
:depends: docker_ Python module
@ -56,7 +56,7 @@ For example:
password: s3cr3t
.. note::
As of the 2016.3.7, 2016.11.4, and Nitrogen releases of Salt, credentials
As of the 2016.3.7, 2016.11.4, and 2017.7.0 releases of Salt, credentials
for the Docker Hub can be configured simply by specifying ``hub`` in place
of the registry URL. In earlier releases, it is necessary to specify the
actual registry URL for the Docker Hub (i.e.
@ -119,7 +119,7 @@ Executing Commands Within a Running Container
.. note::
With the release of Docker 1.13.1, the Execution Driver has been removed.
Starting in versions 2016.3.6, 2016.11.4, and Nitrogen, Salt defaults to
Starting in versions 2016.3.6, 2016.11.4, and 2017.7.0, Salt defaults to
using ``docker exec`` to run commands in containers, however for older Salt
releases it will be necessary to set the ``docker.exec_driver`` config
option to either ``docker-exec`` or ``nsenter`` for Docker versions 1.13.1
@ -767,8 +767,8 @@ def _error_detail(data, item):
# Functions to handle docker-py client args
def get_client_args():
'''
.. versionadded:: 2016.3.6,2016.11.4,Nitrogen
.. versionchanged:: Nitrogen
.. versionadded:: 2016.3.6,2016.11.4,2017.7.0
.. versionchanged:: 2017.7.0
Replaced the container config args with the ones from the API's
``create_container`` function.
@ -852,7 +852,7 @@ def _get_create_kwargs(image,
def compare_container(first, second, ignore=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Compare two containers' Config and and HostConfig and return any
differences between the two.
@ -902,7 +902,7 @@ def compare_container(first, second, ignore=None):
def login(*registries):
'''
.. versionadded:: 2016.3.7,2016.11.4,Nitrogen
.. versionadded:: 2016.3.7,2016.11.4,2017.7.0
Performs a ``docker login`` to authenticate to one or more configured
repositories. See the documentation at the top of this page to configure
@ -1283,7 +1283,7 @@ def info():
def inspect(name):
'''
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
Volumes and networks are now checked, in addition to containers and
images.
@ -2890,7 +2890,7 @@ def rm_(name, force=False, volumes=False, **kwargs):
option is set to ``False`` by default to prevent accidental removal of
a running container.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
volumes : False
Also remove volumes associated with container
@ -2928,7 +2928,7 @@ def rm_(name, force=False, volumes=False, **kwargs):
def rename(name, new_name):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Renames a container. Returns ``True`` if successful, and raises an error if
the API returns one. If unsuccessful and the API returns no error (should
@ -3927,7 +3927,7 @@ def tag_(name, image, force=False):
# Network Management
def networks(names=None, ids=None):
'''
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
The ``names`` and ``ids`` can be passed as a comma-separated list now,
as well as a Python list.
@ -4045,7 +4045,7 @@ def connect_container_to_network(container, network_id, ipv4_address=None):
ipv4_address
The IPv4 address to connect to the container
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -4362,7 +4362,7 @@ def stop(name, timeout=None, **kwargs):
Timeout in seconds after which the container will be killed (if it has
not yet gracefully shut down)
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
If this argument is not passed, then the container's configuration
will be checked. If the container was created using the
``stop_timeout`` argument, then the configured timeout will be

46
salt/modules/elasticsearch.py
View File

@ -152,7 +152,7 @@ def _get_instance(hosts=None, profile=None):
def ping(allow_failure=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Test connection to Elasticsearch instance. This method does not fail if not explicitly specified.
@ -175,7 +175,7 @@ def ping(allow_failure=False, hosts=None, profile=None):
def info(hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return Elasticsearch information.
@ -194,7 +194,7 @@ def info(hosts=None, profile=None):
def node_info(nodes=None, flat_settings=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return Elasticsearch node information.
@ -217,7 +217,7 @@ def node_info(nodes=None, flat_settings=False, hosts=None, profile=None):
def cluster_health(index=None, level='cluster', local=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return Elasticsearch cluster health.
@ -242,7 +242,7 @@ def cluster_health(index=None, level='cluster', local=False, hosts=None, profile
def cluster_stats(nodes=None, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return Elasticsearch cluster stats.
@ -548,7 +548,7 @@ def index_get(index, hosts=None, profile=None):
def index_open(index, allow_no_indices=True, expand_wildcards='closed', ignore_unavailable=True, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Open specified index.
@ -577,7 +577,7 @@ def index_open(index, allow_no_indices=True, expand_wildcards='closed', ignore_u
def index_close(index, allow_no_indices=True, expand_wildcards='open', ignore_unavailable=True, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Close specified index.
@ -762,7 +762,7 @@ def index_template_get(name, hosts=None, profile=None):
def pipeline_get(id, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Retrieve Ingest pipeline definition. Available since Elasticsearch 5.0.
@ -787,7 +787,7 @@ def pipeline_get(id, hosts=None, profile=None):
def pipeline_delete(id, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Delete Ingest pipeline. Available since Elasticsearch 5.0.
@ -813,7 +813,7 @@ def pipeline_delete(id, hosts=None, profile=None):
def pipeline_create(id, body, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create Ingest pipeline by supplied definition. Available since Elasticsearch 5.0.
@ -838,7 +838,7 @@ def pipeline_create(id, body, hosts=None, profile=None):
def pipeline_simulate(id, body, verbose=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Simulate existing Ingest pipeline on provided data. Available since Elasticsearch 5.0.
@ -864,7 +864,7 @@ def pipeline_simulate(id, body, verbose=False, hosts=None, profile=None):
def search_template_get(id, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Obtain existing search template definition.
@ -887,7 +887,7 @@ def search_template_get(id, hosts=None, profile=None):
def search_template_create(id, body, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create search template by supplied definition
@ -912,7 +912,7 @@ def search_template_create(id, body, hosts=None, profile=None):
def search_template_delete(id, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Delete existing search template definition.
@ -937,7 +937,7 @@ def search_template_delete(id, hosts=None, profile=None):
def repository_get(name, local=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Get existing repository details.
@ -962,7 +962,7 @@ def repository_get(name, local=False, hosts=None, profile=None):
def repository_create(name, body, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create repository for storing snapshots. Note that shared repository paths have to be specified in path.repo Elasticsearch configuration option.
@ -987,7 +987,7 @@ def repository_create(name, body, hosts=None, profile=None):
def repository_delete(name, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Delete existing repository.
@ -1012,7 +1012,7 @@ def repository_delete(name, hosts=None, profile=None):
def repository_verify(name, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Obtain list of cluster nodes which successfully verified this repository.
@ -1035,7 +1035,7 @@ def repository_verify(name, hosts=None, profile=None):
def snapshot_status(repository=None, snapshot=None, ignore_unavailable=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Obtain status of all currently running snapshots.
@ -1060,7 +1060,7 @@ def snapshot_status(repository=None, snapshot=None, ignore_unavailable=False, ho
def snapshot_get(repository, snapshot, ignore_unavailable=False, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Obtain snapshot residing in specified repository.
@ -1085,7 +1085,7 @@ def snapshot_get(repository, snapshot, ignore_unavailable=False, hosts=None, pro
def snapshot_create(repository, snapshot, body=None, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Create snapshot in specified repository by supplied definition.
@ -1112,7 +1112,7 @@ def snapshot_create(repository, snapshot, body=None, hosts=None, profile=None):
def snapshot_restore(repository, snapshot, body=None, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Restore existing snapshot in specified repository by supplied definition.
@ -1139,7 +1139,7 @@ def snapshot_restore(repository, snapshot, body=None, hosts=None, profile=None):
def snapshot_delete(repository, snapshot, hosts=None, profile=None):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Delete snapshot from specified repository.

6
salt/modules/file.py
View File

@ -3367,7 +3367,7 @@ def access(path, mode):
def read(path, binary=False):
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the content of the file.
@ -4880,14 +4880,14 @@ def manage_file(name,
See https://docs.python.org/3/library/codecs.html#standard-encodings
for the list of available encodings.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
encoding_errors : 'strict'
Default is ```'strict'```.
See https://docs.python.org/2/library/codecs.html#codec-base-classes
for the error handling schemes.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:

2
salt/modules/freebsd_update.py
View File

@ -2,7 +2,7 @@
'''
Support for freebsd-update utility on FreeBSD.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:maintainer: George Mamalakis <mamalos@gmail.com>
:maturity: new

46
salt/modules/git.py
View File

@ -399,7 +399,7 @@ def add(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -524,7 +524,7 @@ def archive(cwd,
``archive`` subcommand), in a single string. This is useful for passing
``-c`` to run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -629,7 +629,7 @@ def branch(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -708,7 +708,7 @@ def checkout(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -822,7 +822,7 @@ def clone(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -966,7 +966,7 @@ def commit(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -1596,7 +1596,7 @@ def diff(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -1767,7 +1767,7 @@ def fetch(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -1937,7 +1937,7 @@ def init(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -2506,7 +2506,7 @@ def ls_remote(cwd=None,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -2644,7 +2644,7 @@ def merge(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -2776,7 +2776,7 @@ def merge_base(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3002,7 +3002,7 @@ def pull(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3114,7 +3114,7 @@ def push(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3228,7 +3228,7 @@ def rebase(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3677,7 +3677,7 @@ def reset(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3752,7 +3752,7 @@ def rev_parse(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3893,7 +3893,7 @@ def rm_(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -3962,7 +3962,7 @@ def stash(cwd,
subcommand), in a single string. This is useful for passing ``-c`` to
run git with temporary changes to the git configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -4113,7 +4113,7 @@ def submodule(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -4251,7 +4251,7 @@ def symbolic_ref(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -4422,7 +4422,7 @@ def worktree_add(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.
@ -4547,7 +4547,7 @@ def worktree_prune(cwd,
passing ``-c`` to run git with temporary changes to the git
configuration.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
.. note::
This is only supported in git 1.7.2 and newer.

6
salt/modules/github.py
View File

@ -804,7 +804,7 @@ def get_repo_teams(repo_name, profile='github'):
'''
Return teams belonging to a repository.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
repo_name
The name of the repository from which to retrieve teams.
@ -1385,7 +1385,7 @@ def add_team_repo(repo_name, team_name, profile="github", permission=None):
'push' or 'admin'. If not specified, the default permission specified on
the team will be used.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:
@ -1727,7 +1727,7 @@ def get_prs(repo_name=None,
Returns information for all pull requests in a given repository, based on
the search options provided.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
repo_name
The name of the repository for which to list pull requests. This

2
salt/modules/grafana4.py
View File

@ -2,7 +2,7 @@
'''
Module for working with the Grafana v4 API
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: requests

4
salt/modules/grains.py
View File

@ -415,7 +415,7 @@ def remove(key, val, delimiter=DEFAULT_TARGET_DELIM):
def delkey(key):
'''
.. versionadded:: nitrogen
.. versionadded:: 2017.7.0
Remove a grain completely from the grain system, this will remove the
grain key and value
@ -765,7 +765,7 @@ def equals(key, value):
Returns ``True`` if matches otherwise ``False``.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:

2
salt/modules/hashutil.py
View File

@ -266,7 +266,7 @@ def github_signature(string, shared_secret, challenge_hmac):
Verify a challenging hmac signature against a string / shared-secret for
github webhooks.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns a boolean if the verification succeeded or failed.

2
salt/modules/heat.py
View File

@ -2,7 +2,7 @@
'''
Module for handling OpenStack Heat calls
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: - heatclient Python module
:configuration: This module is not usable until the user, password, tenant, and

2
salt/modules/icinga2.py
View File

@ -2,7 +2,7 @@
'''
Module to provide icinga2 compatibility to salt.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:depends: - icinga2 server
'''

2
salt/modules/logmod.py
View File

@ -3,7 +3,7 @@
On-demand logging
=================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
The sole purpose of this module is logging messages in the (proxy) minion.
It comes very handy when debugging complex Jinja templates, for example:

2
salt/modules/match.py
View File

@ -365,7 +365,7 @@ def search_by(lookup, tgt_type='compound', minion_id=None):
<salt.modules.match.filter_by>` and allows matching values instead of
matching keys. A minion can be matched by multiple entries.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:

2
salt/modules/mattermost.py
View File

@ -2,7 +2,7 @@
'''
Module for sending messages to Mattermost
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:configuration: This module can be used by either passing an api_url and hook
directly or by specifying both in a configuration profile in the salt

2
salt/modules/msteams.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
'''
Module for sending messages to MS Teams
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:configuration: This module can be used by either passing a hook_url
directly or by specifying it in a configuration profile in the salt
master/minion config.

2
salt/modules/mysql.py
View File

@ -685,7 +685,7 @@ def file_query(database, file_name, **connection_args):
Run an arbitrary SQL query from the specified file and return the
the number of affected rows.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
CLI Example:

2
salt/modules/namecheap_dns.py
View File

@ -2,7 +2,7 @@
'''
Namecheap management
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
General Notes
-------------

2
salt/modules/namecheap_domains.py
View File

@ -2,7 +2,7 @@
'''
Namecheap management
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
General Notes
-------------

2
salt/modules/namecheap_ns.py
View File

@ -2,7 +2,7 @@
'''
Namecheap management
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
General Notes
-------------

2
salt/modules/namecheap_ssl.py
View File

@ -2,7 +2,7 @@
'''
Namecheap management
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
General Notes
-------------

2
salt/modules/namecheap_users.py
View File

@ -2,7 +2,7 @@
'''
Namecheap management
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
General Notes
-------------

2
salt/modules/napalm.py
View File

@ -5,7 +5,7 @@ NAPALM helpers
Helpers for the NAPALM modules.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import absolute_import

2
salt/modules/napalm_acl.py
View File

@ -5,7 +5,7 @@ NAPALM ACL
Generate and load ACL (firewall) configuration on network devices.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:codeauthor: Mircea Ulinic <mircea@cloudflare.com>
:maturity: new

6
salt/modules/napalm_network.py
View File

@ -16,7 +16,7 @@ Dependencies
- :mod:`napalm proxy minion <salt.proxy.napalm>`
.. versionadded:: 2016.11.0
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
'''
from __future__ import absolute_import
@ -817,7 +817,7 @@ def mac(address='', interface='', vlan=0, **kwargs): # pylint: disable=unused-a
@proxy_napalm_wrap
def config(source=None, **kwargs): # pylint: disable=unused-argument
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Return the whole configuration of the network device.
By default, it will return all possible configuration
@ -870,7 +870,7 @@ def config(source=None, **kwargs): # pylint: disable=unused-argument
@proxy_napalm_wrap
def optics(**kwargs): # pylint: disable=unused-argument
'''
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Fetches the power usage on the various transceivers installed
on the network device (in dBm), and returns a view that conforms with the

2
salt/modules/napalm_route.py
View File

@ -76,7 +76,7 @@ def show(destination, protocol=None, **kwargs): # pylint: disable=unused-argume
protocol (optional)
protocol used to learn the routes to the destination.
.. versionchanged:: Nitrogen
.. versionchanged:: 2017.7.0
CLI Example:

2
salt/modules/napalm_yang_mod.py
View File

@ -5,7 +5,7 @@ NAPALM YANG
NAPALM YANG basic operations.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import absolute_import

2
salt/modules/nix.py
View File

@ -3,7 +3,7 @@
Work with Nix packages
======================
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Does not require the machine to be Nixos, just have Nix installed and available to use for the user running this command. Their profile must
be located in their home, under ``$HOME/.nix-profile/``, and the nix store, unless specially set up, should be in ``/nix``. To easily use this

2
salt/modules/npm.py
View File

@ -281,7 +281,7 @@ def list_(pkg=None, dir=None, runas=None, env=None, depth=None):
depth
Limit the depth of the packages listed
.. versionadded:: 2016.11.6, Nitrogen
.. versionadded:: 2016.11.6, 2017.7.0
CLI Example:

8
salt/modules/opkg.py
View File

@ -226,7 +226,7 @@ def install(name=None,
Install a specific version of the package, e.g. 1.2.3~0ubuntu0. Ignored
if "pkgs" or "sources" is passed.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
reinstall : False
Specifying reinstall=True will use ``opkg install --force-reinstall``
@ -237,7 +237,7 @@ def install(name=None,
install --force-reinstall`` will only be used if the installed version
matches the requested version.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Multiple Package Installation Options:
@ -272,7 +272,7 @@ def install(name=None,
Only upgrade the packages (disallow downgrades), if they are already
installed. Default is False.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
Returns a dict containing the new package names and versions::
@ -900,7 +900,7 @@ def info_installed(*names, **kwargs):
'''
Return the information of the named package(s), installed on the system.
.. versionadded:: Nitrogen
.. versionadded:: 2017.7.0
:param names:
Names of the packages to get information about. If none are specified,

2
salt/modules/pdbedit.py
View File

@ -6,7 +6,7 @@ Manage accounts in Samba's passdb using pdbedit
:maturity: new
:platform: posix
.. versionadded:: nitrogen
.. versionadded:: 2017.7.0
'''
from __future__ import absolute_import

Some files were not shown because too many files have changed in this diff Show More