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

Merge branch 'carbon' into 'develop'

Browse source 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
This commit is contained in:
rallytime 2016-10-28 11:58:41 -06:00
commit 8d3957f250
184 changed files with 14612 additions and 2243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/man/salt-api.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-API" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-api \- salt-api Command
.

2
doc/man/salt-call.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-CALL" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.

2
doc/man/salt-cloud.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-CLOUD" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.

2
doc/man/salt-cp.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-CP" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.

2
doc/man/salt-key.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-KEY" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.

2
doc/man/salt-master.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-MASTER" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.

2
doc/man/salt-minion.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-MINION" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.

2
doc/man/salt-proxy.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-PROXY" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-PROXY" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-proxy \- salt-proxy Documentation
.

2
doc/man/salt-run.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-RUN" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.

2
doc/man/salt-ssh.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-SSH" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.

2
doc/man/salt-syndic.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-SYNDIC" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.

2
doc/man/salt-unity.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT-UNITY" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.

4
doc/man/salt.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SALT" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
salt \- salt
.
@ -108,7 +108,7 @@ Override the configured \fBstate_output\fP value for minion output. One of
.B \-\-subset=SUBSET
Execute the routine on a random subset of the targeted minions. The
minions will be verified that they have the named function before
executing.
executing. The SUBSET argument is the count of the minions to target.
.UNINDENT
.INDENT 0.0
.TP

15328
doc/man/salt.7
View file

File diff suppressed because it is too large Load diff

2
doc/man/spm.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SPM" "1" "July 18, 2016" "2016.3.1" "Salt"
.TH "SPM" "1" "October 26, 2016" "2016.3.4" "Salt"
.SH NAME
spm \- Salt Package Manager Command
.

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

@ -536,7 +536,7 @@ Default: ``[]``
Only return events matching tags in a whitelist.
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
Supports glob matching patterns.
@ -557,7 +557,7 @@ Default: ``[]``
Store all event returns _except_ the tags in a blacklist.
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
Supports glob matching patterns.
@ -1387,7 +1387,7 @@ is impacted.
------------------------------
.. versionadded:: 2014.1.0
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
The default was changed from ``30`` seconds to ``20``.
Default: ``20``
@ -1584,7 +1584,7 @@ compatible version installed will be the provider that is used.
``gitfs_ssl_verify``
********************
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
Default: ``True``
@ -1594,7 +1594,7 @@ git repo that uses a self-signed certificate. However, keep in mind that
setting this to anything other ``True`` is a considered insecure, and using an
SSH-based transport (if available) may be a better option.
In the Carbon release, the default config value changed from ``False`` to
In the 2016.11.0 release, the default config value changed from ``False`` to
``True``.
.. code-block:: yaml
@ -1672,7 +1672,7 @@ Defines which branch/tag should be used as the ``base`` environment.
``gitfs_saltenv``
*****************
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Default: ``[]``
@ -2446,7 +2446,7 @@ There are additional details at :ref:`salt-pillars`
``pillar_roots_override_ext_pillar``
------------------------------------
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Default: ``False``
@ -2637,7 +2637,7 @@ files would be looked for in a subdirectory called ``pillar``.
*************************
.. versionadded:: 2015.8.0
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
Default: ``False``
@ -2647,7 +2647,7 @@ git repo that uses a self-signed certificate. However, keep in mind that
setting this to anything other ``True`` is a considered insecure, and using an
SSH-based transport (if available) may be a better option.
In the Carbon release, the default config value changed from ``False`` to
In the 2016.11.0 release, the default config value changed from ``False`` to
``True``.
.. code-block:: yaml
@ -3602,7 +3602,7 @@ branch/tag.
----------------------
.. versionadded:: 2015.8.0
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
Default: ``False``
@ -3612,7 +3612,7 @@ git repo that uses a self-signed certificate. However, keep in mind that
setting this to anything other ``True`` is a considered insecure, and using an
SSH-based transport (if available) may be a better option.
In the Carbon release, the default config value changed from ``False`` to
In the 2016.11.0 release, the default config value changed from ``False`` to
``True``.
.. code-block:: yaml

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

@ -1319,7 +1319,7 @@ This option has no default value. Set it to an environment name to ensure that
``top_file_merging_strategy``
-----------------------------
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
A ``merge_all`` strategy has been added.
Default: ``merge``
@ -1732,7 +1732,7 @@ the `cmd_blacklist_glob` list and any matched shell command will be blocked.
`salt-call` commands. This does NOT blacklist commands called from states
or shell commands executed from other modules.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
.. code-block:: yaml
@ -1758,7 +1758,7 @@ blocked. If `cmd_whitelist_glob` is NOT SET, then all shell commands are permitt
`salt-call` commands. This does NOT restrict commands called from states
or shell commands executed from other modules.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
.. code-block:: yaml
@ -2065,7 +2065,7 @@ have other services that need to go with it.
``winrepo_cache_expire_min``
----------------------------
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Default: ``0``
@ -2084,7 +2084,7 @@ will always refresh the metadata, regardless of age.
``winrepo_cache_expire_max``
----------------------------
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Default: ``21600``

2
doc/ref/modules/index.rst
View file

@ -156,7 +156,7 @@ module and pass the argument ``bar`` to it.
Calling Execution Modules on the Salt Master
============================================
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Execution modules can now also be called via the :command:`salt-run` command
using the :ref:`salt runner <salt_salt_runner>`.

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

@ -371,8 +371,8 @@ The ``onfail`` requisite is applied in the same way as ``require`` as ``watch``:
.. note::
Beginning in the ``Carbon`` release of Salt, ``onfail`` uses OR logic for
multiple listed ``onfail`` requisites. Prior to the ``Carbon`` release,
Beginning in the ``2016.11.0`` release of Salt, ``onfail`` uses OR logic for
multiple listed ``onfail`` requisites. Prior to the ``2016.11.0`` release,
``onfail`` used AND logic. See `Issue #22370`_ for more information.
.. _Issue #22370: https://github.com/saltstack/salt/issues/22370

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

@ -440,7 +440,7 @@ environment, no states from the ``qa`` environment would be applied.
Scenario 3 - No Environment Specified, :conf_minion:`top_file_merging_strategy` is "same"
-----------------------------------------------------------------------------------------
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
In prior versions, "same" did not quite work as described below (see
here__). This has now been corrected. It was decided that changing
something like top file handling in a point release had the potential to
@ -461,7 +461,7 @@ and ``qa2`` from the ``qa`` environment would be applied to all minions.
Scenario 4 - No Environment Specified, :conf_minion:`top_file_merging_strategy` is "merge_all"
----------------------------------------------------------------------------------------------
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
In this scenario, all configured states in all top files are applied. From the
``base`` environment, ``base1`` would be applied to all minions, with ``base2``

2
doc/topics/cloud/vmware.rst
View file

@ -220,7 +220,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
the current VM/template\'s vCPU count is used.
``cores_per_socket``
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Enter the number of cores per vCPU that you want the VM/template to have. If not specified,
this will default to 1.

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

@ -122,7 +122,7 @@ Runner Events
.. salt:event:: salt/run/<JID>/args
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Fired by the :mod:`state.orchestrate <salt.runners.state.orchestrate>`
runner

2
doc/topics/netapi/writing.rst
View file

@ -43,7 +43,7 @@ actually starts the service. This is started in a multiprocess.
Multiple instances
==================
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:py:mod:`~salt.netapi.rest_cherrypy` and :py:mod:`~salt.netapi.rest_tornado`
support running multiple instances by copying and renaming entire directory

2
doc/topics/orchestrate/orchestrate_runner.rst
View file

@ -82,7 +82,7 @@ will apply the states defined in that file.
Masterless Orchestration
~~~~~~~~~~~~~~~~~~~~~~~~
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
To support salt orchestration on masterless minions, the Orchestrate Runner is
available as an execution module. The syntax for masterless orchestration is

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

@ -36,8 +36,8 @@ or more minions.
See :doc:`Proxyminion Beacon </topics/proxyminion/beacon>` to help
with easy configuration and management of ``salt-proxy`` processes.
New in Carbon
-------------
New in 2016.11.0
----------------
Proxy minions now support configuration files with names ending in '*.conf'
and placed in /etc/salt/proxy.d.
@ -114,7 +114,7 @@ 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 ``False`` in this release. It will default to True in the release after
next. The next release is codenamed **Carbon**, the following is **Nitrogen**.
next. The next release is 2016.11.0, the following is **Nitrogen**.
@ -311,7 +311,7 @@ proxy minions will only see the keys specific to the proxies it will be
handling.
Proxies can be configured in /etc/salt/proxy or with files in /etc/salt/proxy.d as of
Salt's Carbon release.
Salt's 2016.11.0 release.
Also, in general, proxy-minions are lightweight, so the machines that run them
could conceivably control a large number of devices. To run more than one proxy from

109
doc/topics/releases/2016.3.4.rst
View file

@ -8,15 +8,13 @@ Version 2016.3.4 is a bugfix release for :doc:`2016.3.0
Known Issues
------------
`Bootstrap Issue #973`_: ``python-futures`` is not installed when installing from a git tag
on RedHat-based distributions. ``Python futures`` is needed when running Salt with the TCP
transport. This is fixed on the ``develop`` branch of the `salt-bootstrap repo`_ and the fix
will be included in the upcoming release of salt-bootstrap, but is a bug in the bootstrap
release that ships with this version of Salt. Please see the `salt-bootstrap repo`_
for more information on how to update your bootstrap version.
The release of the `bootstrap-salt.sh` script that is included with 2016.3.4 release has a bug
in it that fails to install salt correctly for git installs using tags in the 2015.5 branch.
This bug has not been fixed in the `salt-bootstrap repository`_ yet, but the
`previous bootstrap release`_ (v2016.08.16) does not contain this bug.
.. _`Bootstrap Issue #973`: https://github.com/saltstack/salt-bootstrap/issues/973
.. _`salt-bootstrap repo`: https://github.com/saltstack/salt-bootstrap
.. _`previous bootstrap release`: https://raw.githubusercontent.com/saltstack/salt-bootstrap/v2016.08.16/bootstrap-salt.sh
.. _`salt-bootstrap repository`: https://github.com/saltstack/salt-bootstrap
Changes
-------
@ -31,12 +29,48 @@ Changes for v2016.3.3..v2016.3.4
Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
*Generated at: 2016-10-20T20:50:09Z*
*Generated at: 2016-10-27T16:10:53Z*
Total Merges: **237**
Total Merges: **274**
Changes:
- **PR** `#37282`_: (*thatch45*) add cpub to raet event for compat
- **PR** `#37278`_: (*jfindlay*) update 2016.3.4 release notes
- **PR** `#37252`_: (*vutny*) Set logging level to 'info' for message about init system detection
- 47290d8 Update man pages for the 2016.3 branch (`#37259`_)
- **PR** `#37257`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3
- **PR** `#37254`_: (*DmitryKuzmenko*) Bugs/37191 minion hangs
- **PR** `#37218`_: (*darkalia*) Issue `#37187`_ Do not parse first /proc/1/cmdline binary if it's not *b…
- **PR** `#37239`_: (*Ch3LL*) Fix cloud tests timeout
- **PR** `#37244`_: (*rallytime*) Update bootstrap release to 2016.10.25
- **PR** `#37245`_: (*rallytime*) Back-port `#36334`_ to 2016.3
- **PR** `#37233`_: (*rallytime*) Back-port `#37154`_ to 2016.3
- **PR** `#37232`_: (*rallytime*) Back-port `#37153`_ to 2016.3
- **PR** `#37228`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3
- **PR** `#37213`_: (*cachedout*) More salttesting fixes
- **PR** `#37207`_: (*cachedout*) Correct documentation for mine_functions
- **PR** `#37208`_: (*cachedout*) Give multimion a process manager and its own destroy method
- **PR** `#37206`_: (*cachedout*) Address transport test hang
- **PR** `#37179`_: (*isbm*) Fix Salt-API ssh crash (2016.3)
- **PR** `#37183`_: (*gtmanfred*) load tags should reference the actual load tags
- **PR** `#37188`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3
- d7e28d2 Pylint fix for 2016.3 (`#37186`_)
- **PR** `#37175`_: (*cachedout*) Fix test hang
- **PR** `#37144`_: (*DmitryKuzmenko*) Bugs/36866 salt minion communication broken 2016.3
- **PR** `#37158`_: (*jfindlay*) add mock for `status.uptime` unit test
- **PR** `#37161`_: (*rallytime*) Back-port `#37098`_ to 2016.3
- **PR** `#37159`_: (*rallytime*) Back-port `#37107`_ to 2016.3
- **PR** `#37163`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3
- 2bc5ded Allow the minion test daemons a couple of tries to connect to the master (`#37150`_)
- ec7ad9e Add note about salt-bootstrap known issue for 2016.3.4 (`#37152`_)
- **PR** `#37135`_: (*AaronM-Cloudtek*) Fix example signing policy in salt.states.x509 docs
- **PR** `#37140`_: (*vutny*) pkgbuild.repo: fix GPG signing with `use_passphrase=False`
- **PR** `#37071`_: (*vutny*) pkgbuild.repo: add `timeout` parameter for waiting passphrase prompt
- **PR** `#37115`_: (*DmitryKuzmenko*) Backport/36720 fix race condition
- **PR** `#37119`_: (*jfindlay*) log.setup: only assign user if defined
- f22c686 fix digital ocean image name in profile (`#37126`_)
- 4263849 add 2016.3.4 release notes (`#37125`_)
- **PR** `#37120`_: (*rallytime*) Back-port `#36246`_ to 2016.3
- **PR** `#37103`_: (*cachedout*) Remove unnecessary sleep from unit.utils.process_test.TestProcessMana…
- **PR** `#36823`_: (*terminalmage*) Update debian systemd unit files to use default KillMode, Type=notify
@ -459,6 +493,7 @@ Changes:
.. _`#36325`: https://github.com/saltstack/salt/pull/36325
.. _`#36329`: https://github.com/saltstack/salt/pull/36329
.. _`#36330`: https://github.com/saltstack/salt/pull/36330
.. _`#36334`: https://github.com/saltstack/salt/pull/36334
.. _`#36335`: https://github.com/saltstack/salt/pull/36335
.. _`#36337`: https://github.com/saltstack/salt/pull/36337
.. _`#36339`: https://github.com/saltstack/salt/pull/36339
@ -567,6 +602,7 @@ Changes:
.. _`#36700`: https://github.com/saltstack/salt/pull/36700
.. _`#36716`: https://github.com/saltstack/salt/pull/36716
.. _`#36719`: https://github.com/saltstack/salt/pull/36719
.. _`#36720`: https://github.com/saltstack/salt/pull/36720
.. _`#36722`: https://github.com/saltstack/salt/pull/36722
.. _`#36724`: https://github.com/saltstack/salt/pull/36724
.. _`#36725`: https://github.com/saltstack/salt/pull/36725
@ -647,11 +683,64 @@ Changes:
.. _`#37054`: https://github.com/saltstack/salt/pull/37054
.. _`#37057`: https://github.com/saltstack/salt/pull/37057
.. _`#37064`: https://github.com/saltstack/salt/pull/37064
.. _`#37071`: https://github.com/saltstack/salt/pull/37071
.. _`#37072`: https://github.com/saltstack/salt/pull/37072
.. _`#37076`: https://github.com/saltstack/salt/pull/37076
.. _`#37081`: https://github.com/saltstack/salt/pull/37081
.. _`#37086`: https://github.com/saltstack/salt/pull/37086
.. _`#37087`: https://github.com/saltstack/salt/pull/37087
.. _`#37088`: https://github.com/saltstack/salt/pull/37088
.. _`#37090`: https://github.com/saltstack/salt/pull/37090
.. _`#37098`: https://github.com/saltstack/salt/pull/37098
.. _`#37099`: https://github.com/saltstack/salt/pull/37099
.. _`#37101`: https://github.com/saltstack/salt/pull/37101
.. _`#37103`: https://github.com/saltstack/salt/pull/37103
.. _`#37107`: https://github.com/saltstack/salt/pull/37107
.. _`#37109`: https://github.com/saltstack/salt/pull/37109
.. _`#37115`: https://github.com/saltstack/salt/pull/37115
.. _`#37117`: https://github.com/saltstack/salt/pull/37117
.. _`#37119`: https://github.com/saltstack/salt/pull/37119
.. _`#37120`: https://github.com/saltstack/salt/pull/37120
.. _`#37125`: https://github.com/saltstack/salt/pull/37125
.. _`#37126`: https://github.com/saltstack/salt/pull/37126
.. _`#37135`: https://github.com/saltstack/salt/pull/37135
.. _`#37137`: https://github.com/saltstack/salt/pull/37137
.. _`#37139`: https://github.com/saltstack/salt/pull/37139
.. _`#37140`: https://github.com/saltstack/salt/pull/37140
.. _`#37142`: https://github.com/saltstack/salt/pull/37142
.. _`#37144`: https://github.com/saltstack/salt/pull/37144
.. _`#37150`: https://github.com/saltstack/salt/pull/37150
.. _`#37152`: https://github.com/saltstack/salt/pull/37152
.. _`#37153`: https://github.com/saltstack/salt/pull/37153
.. _`#37154`: https://github.com/saltstack/salt/pull/37154
.. _`#37157`: https://github.com/saltstack/salt/pull/37157
.. _`#37158`: https://github.com/saltstack/salt/pull/37158
.. _`#37159`: https://github.com/saltstack/salt/pull/37159
.. _`#37161`: https://github.com/saltstack/salt/pull/37161
.. _`#37162`: https://github.com/saltstack/salt/pull/37162
.. _`#37163`: https://github.com/saltstack/salt/pull/37163
.. _`#37167`: https://github.com/saltstack/salt/pull/37167
.. _`#37175`: https://github.com/saltstack/salt/pull/37175
.. _`#37178`: https://github.com/saltstack/salt/pull/37178
.. _`#37179`: https://github.com/saltstack/salt/pull/37179
.. _`#37183`: https://github.com/saltstack/salt/pull/37183
.. _`#37186`: https://github.com/saltstack/salt/pull/37186
.. _`#37188`: https://github.com/saltstack/salt/pull/37188
.. _`#37206`: https://github.com/saltstack/salt/pull/37206
.. _`#37207`: https://github.com/saltstack/salt/pull/37207
.. _`#37208`: https://github.com/saltstack/salt/pull/37208
.. _`#37213`: https://github.com/saltstack/salt/pull/37213
.. _`#37218`: https://github.com/saltstack/salt/pull/37218
.. _`#37228`: https://github.com/saltstack/salt/pull/37228
.. _`#37232`: https://github.com/saltstack/salt/pull/37232
.. _`#37233`: https://github.com/saltstack/salt/pull/37233
.. _`#37234`: https://github.com/saltstack/salt/pull/37234
.. _`#37239`: https://github.com/saltstack/salt/pull/37239
.. _`#37244`: https://github.com/saltstack/salt/pull/37244
.. _`#37245`: https://github.com/saltstack/salt/pull/37245
.. _`#37252`: https://github.com/saltstack/salt/pull/37252
.. _`#37254`: https://github.com/saltstack/salt/pull/37254
.. _`#37257`: https://github.com/saltstack/salt/pull/37257
.. _`#37259`: https://github.com/saltstack/salt/pull/37259
.. _`#37278`: https://github.com/saltstack/salt/pull/37278
.. _`#37282`: https://github.com/saltstack/salt/pull/37282

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

@ -94,7 +94,7 @@ They can now also be defined as a YAML list, like this:
- host2
- host3
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Using Nodegroups in SLS files
=============================

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

@ -127,8 +127,8 @@ in the ``startreg`` codeblock has been successfully called first.
Thorium Links to Beacons
------------------------
The above example was added in the Carbon release of Salt and makes use of the
``status`` beacon also added in the Carbon release. For the above Thorium state
The above example was added in the 2016.11.0 release of Salt and makes use of the
``status`` beacon also added in the 2016.11.0 release. For the above Thorium state
to function properly you will also need to enable the ``status`` beacon in the
``minion`` configuration file:

2
doc/topics/tutorials/docker_sls.rst
View file

@ -1,7 +1,7 @@
Running Salt States and Commands in Docker Containers
=====================================================
The Carbon release of Salt introduces the ability to execute Salt States
The 2016.11.0 release of Salt introduces the ability to execute Salt States
and Salt remote execution commands directly inside of Docker containers.
This addition makes it possible to not only deploy fresh containers using

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

@ -398,9 +398,9 @@ In the example configuration above, the following is true:
.. _gitfs-per-saltenv-config:
Per-Saltenv Configuration Parameters
===================================
====================================
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
For more granular control, Salt allows the following three things to be
overridden for individual saltenvs within a given repo:

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

@ -5,7 +5,7 @@ Utility Modules - Code Reuse in Custom Modules
==============================================
.. versionadded:: 2015.5.0
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
These can now be synced to the Master for use in custom Runners, and in
custom execution modules called within Pillar SLS files.

20
salt/auth/ldap.py
View file

@ -341,6 +341,26 @@ def groups(username, **kwargs):
if 'cn' in entry:
group_list.append(entry['cn'][0])
log.debug('User {0} is a member of groups: {1}'.format(username, group_list))
elif _config('freeipa'):
escaped_username = ldap.filter.escape_filter_chars(username)
search_base = _config('group_basedn')
search_string = _render_template(_config('group_filter'), escaped_username)
search_results = bind.search_s(search_base,
ldap.SCOPE_SUBTREE,
search_string,
[_config('accountattributename'), 'cn'])
for entry, result in search_results:
for user in result[_config('accountattributename')]:
if username == user.split(',')[0].split('=')[-1]:
group_list.append(entry.split(',')[0].split('=')[-1])
log.debug('User {0} is a member of groups: {1}'.format(username, group_list))
if not auth(username, kwargs['password']):
log.error('LDAP username and password do not match')
return []
else:
if _config('groupou'):
search_base = 'ou={0},{1}'.format(_config('groupou'), _config('basedn'))

2
salt/beacons/avahi_announce.py
View file

@ -2,7 +2,7 @@
'''
Beacon to announce via avahi (zeroconf)
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Dependencies
============

2
salt/beacons/haproxy.py
View file

@ -3,7 +3,7 @@
Watch current connections of haproxy server backends.
Fire an event when over a specified threshold.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
# Import Python libs

2
salt/beacons/status.py
View file

@ -7,7 +7,7 @@ The intention of this beacon is to add the config options to add monitoring
stats to the health beacon making it a one stop shop for gathering systems
health and status data
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
To configure this beacon to use the defaults, set up an empty dict for it in
the minion config:

4
salt/cache/__init__.py vendored
View file

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
'''
Loader mechanism for caching data, with data expirations, etc.
Loader mechanism for caching data, with data expiration, etc.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
# Import Python libs

2
salt/cloud/clouds/azurearm.py
View file

@ -3,7 +3,7 @@
Azure Cloud Module
==================
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
The Azure cloud module is used to control access to Microsoft Azure

2
salt/cloud/clouds/digital_ocean.py
View file

@ -699,7 +699,7 @@ def import_keypair(kwargs=None, call=None):
Upload public key to cloud provider.
Similar to EC2 import_keypair.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
kwargs
file(mandatory): public key file-name

2
salt/cloud/clouds/opennebula.py
View file

@ -763,7 +763,7 @@ def get_template(vm_):
r'''
Return the template id for a VM.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
vm\_
The VM dictionary for which to obtain a template.

28
salt/cloud/clouds/vmware.py
View file

@ -2348,6 +2348,12 @@ def create(vm_):
si = _get_si()
container_ref = None
# If datacenter is specified, set the container reference to start search from it instead
if datacenter:
datacenter_ref = salt.utils.vmware.get_mor_by_property(_get_si(), vim.Datacenter, datacenter)
container_ref = datacenter_ref if datacenter_ref else None
if 'clonefrom' in vm_:
# If datacenter is specified, set the container reference to start search from it instead
if datacenter:
@ -2466,6 +2472,11 @@ def create(vm_):
if not datastore_ref:
raise SaltCloudSystemExit("Specified datastore: '{0}' does not exist".format(datastore))
if host:
host_ref = salt.utils.vmware.get_mor_by_property(_get_si(), vim.HostSystem, host, container_ref=container_ref)
if not host_ref:
log.error("Specified host: '{0}' does not exist".format(host))
# Create the config specs
config_spec = vim.vm.ConfigSpec()
@ -2613,8 +2624,11 @@ def create(vm_):
else:
log.info('Creating {0}'.format(vm_['name']))
task = folder_ref.CreateVM_Task(config_spec, resourcepool_ref)
salt.utils.vmware.wait_for_task(task, vm_name, "create", 5, 'info')
if host:
task = folder_ref.CreateVM_Task(config_spec, resourcepool_ref, host_ref)
else:
task = folder_ref.CreateVM_Task(config_spec, resourcepool_ref)
salt.utils.vmware.wait_for_task(task, vm_name, "create", 15, 'info')
except Exception as exc:
err_msg = 'Error creating {0}: {1}'.format(vm_['name'], exc)
log.error(
@ -2627,9 +2641,13 @@ def create(vm_):
new_vm_ref = salt.utils.vmware.get_mor_by_property(si, vim.VirtualMachine, vm_name, container_ref=container_ref)
# Find how to power on in CreateVM_Task (if possible), for now this will do
if not clone_type and power:
task = new_vm_ref.PowerOn()
salt.utils.vmware.wait_for_task(task, vm_name, 'power', 5, 'info')
try:
if not clone_type and power:
task = new_vm_ref.PowerOn()
salt.utils.vmware.wait_for_task(task, vm_name, 'power', 5, 'info')
except Exception as exc:
log.info('Powering on the VM threw this exception. Ignoring.')
log.info(exc)
# If it a template or if it does not need to be powered on then do not wait for the IP
out = None

4
salt/config/__init__.py
View file

@ -895,7 +895,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 Carbon. Switch to True for Nitrogen
# Default to False for 2016.3 and 2016.11. Switch to True for Nitrogen
'proxy_merge_grains_in_module': bool,
# Command to use to restart salt-minion
@ -2927,7 +2927,7 @@ def is_profile_configured(opts, provider, profile_name, vm_=None):
required_keys.append('image')
if driver == 'vmware':
required_keys.append('datastore')
elif driver in ['linode', 'virtualbox', 'vmware']:
elif driver in ['linode', 'virtualbox']:
required_keys.append('clonefrom')
elif driver == 'nova':
nova_image_keys = ['image', 'block_device_mapping', 'block_device', 'boot_volume']

3
salt/engines/hipchat.py
View file

@ -5,7 +5,8 @@ event bus. Alternatively Salt commands can be sent to the Salt master
via Hipchat by setting the control parameter to ``True`` and using command
prefaced with a ``!``. Only token key is required, but room and control
keys make the engine interactive.
.. versionadded: Carbon
.. versionadded: 2016.11.0
:depends: hypchat
:configuration: Example configuration

2
salt/fileclient.py
View file

@ -661,7 +661,7 @@ class Client(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')

16
salt/fileserver/__init__.py
View file

@ -550,7 +550,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
if 'saltenv' in kwargs:
@ -580,7 +580,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -606,7 +606,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. '
'This parameter is no longer used and has been replaced by '
'\'saltenv\' as of Salt Carbon. This warning will be removed '
'\'saltenv\' as of Salt 2016.11.0. This warning will be removed '
'in Salt Oxygen.'
)
load.pop('env')
@ -653,7 +653,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -735,7 +735,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -766,7 +766,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -797,7 +797,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -828,7 +828,7 @@ class Fileserver(object):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

4
salt/fileserver/azurefs.py
View file

@ -78,7 +78,7 @@ def find_file(path, saltenv='base', **kwargs):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -130,7 +130,7 @@ def serve_file(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

10
salt/fileserver/hgfs.py
View file

@ -717,7 +717,7 @@ def serve_file(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -748,7 +748,7 @@ def file_hash(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -782,7 +782,7 @@ def _file_lists(load, form):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -830,7 +830,7 @@ def _get_file_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -875,7 +875,7 @@ def _get_dir_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

6
salt/fileserver/minionfs.py
View file

@ -160,7 +160,7 @@ def file_hash(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -230,7 +230,7 @@ def file_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -314,7 +314,7 @@ def dir_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

10
salt/fileserver/roots.py
View file

@ -40,7 +40,7 @@ def find_file(path, saltenv='base', **kwargs):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -117,7 +117,7 @@ def serve_file(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -214,7 +214,7 @@ def file_hash(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -294,7 +294,7 @@ def _file_lists(load, form):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -396,7 +396,7 @@ def symlink_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

10
salt/fileserver/s3fs.py
View file

@ -127,7 +127,7 @@ def find_file(path, saltenv='base', **kwargs):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -169,7 +169,7 @@ def file_hash(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -202,7 +202,7 @@ def serve_file(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -244,7 +244,7 @@ def file_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -285,7 +285,7 @@ def dir_list(load):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

6
salt/fileserver/svnfs.py
View file

@ -612,7 +612,7 @@ def serve_file(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -643,7 +643,7 @@ def file_hash(load, fnd):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')
@ -701,7 +701,7 @@ def _file_lists(load, form):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
load.pop('env')

4
salt/grains/core.py
View file

@ -1289,8 +1289,8 @@ def os_data():
elif salt.utils.which('supervisord') in init_cmdline:
grains['init'] = 'supervisord'
else:
log.error(
'Could not determine init location from command line: ({0})'
log.info(
'Could not determine init system from command line: ({0})'
.format(' '.join(init_cmdline))
)

2
salt/grains/nxos.py
View file

@ -2,7 +2,7 @@
'''
Grains for Cisco NX OS Switches Proxy minions
.. versionadded: Carbon
.. versionadded: 2016.11.0
For documentation on setting up the nxos proxy minion look in the documentation
for :doc:`salt.proxy.nxos</ref/proxy/all/salt.proxy.nxos>`.

1
salt/log/setup.py
View file

@ -798,6 +798,7 @@ def setup_multiprocessing_logging_listener(opts, queue=None):
target=__process_multiprocessing_logging_queue,
args=(opts, queue or get_multiprocessing_logging_queue(),)
)
__MP_LOGGING_QUEUE_PROCESS.daemon = True
__MP_LOGGING_QUEUE_PROCESS.start()
__MP_LOGGING_LISTENER_CONFIGURED = True

2
salt/modules/alternatives.py
View file

@ -67,7 +67,7 @@ def show_link(name):
'''
Display master link for the alternative
.. versionadded:: 2015.8.13,2016.3.4,Carbon
.. versionadded:: 2015.8.13,2016.3.4,2016.11.0
CLI Example:

18
salt/modules/aptpkg.py
View file

@ -225,7 +225,7 @@ def latest_version(*names, **kwargs):
cache_valid_time
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Skip refreshing the package database if refresh has already occurred within
<value> seconds
@ -356,7 +356,7 @@ def refresh_db(cache_valid_time=0):
cache_valid_time
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Skip refreshing the package database if refresh has already occurred within
<value> seconds
@ -422,7 +422,7 @@ def install(name=None,
reinstall=False,
**kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -460,7 +460,7 @@ def install(name=None,
cache_valid_time
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Skip refreshing the package database if refresh has already occurred within
<value> seconds
@ -901,7 +901,7 @@ def autoremove(list_only=False, purge=False):
def remove(name=None, pkgs=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -945,7 +945,7 @@ def remove(name=None, pkgs=None, **kwargs):
def purge(name=None, pkgs=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -989,7 +989,7 @@ def purge(name=None, pkgs=None, **kwargs):
def upgrade(refresh=True, dist_upgrade=False, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -1021,7 +1021,7 @@ def upgrade(refresh=True, dist_upgrade=False, **kwargs):
cache_valid_time
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Skip refreshing the package database if refresh has already occurred within
<value> seconds
@ -1422,7 +1422,7 @@ def list_upgrades(refresh=True, dist_upgrade=True, **kwargs):
cache_valid_time
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Skip refreshing the package database if refresh has already occurred within
<value> seconds

2
salt/modules/archive.py
View file

@ -557,7 +557,7 @@ def unzip(zip_file, dest, excludes=None, options=None, template=None,
On Windows, only the read-only flag will be extracted as set within the zip file,
other attributes (i.e. user/group permissions) are ignored.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:

8
salt/modules/blockdev.py
View file

@ -3,7 +3,7 @@
Module for managing block devices
.. versionadded:: 2014.7.0
.. deprecated:: Carbon
.. deprecated:: 2016.11.0
Merged to `disk` module
'''
@ -44,7 +44,7 @@ def format_(device, fs_type='ext4',
.. versionadded:: 2015.8.2
.. deprecated:: Carbon
.. deprecated:: 2016.11.0
device
The block device in which to create the new filesystem
@ -74,7 +74,7 @@ def format_(device, fs_type='ext4',
This option is dangerous, use it with caution.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -100,7 +100,7 @@ def fstype(device):
.. versionadded:: 2015.8.2
.. deprecated:: Carbon
.. deprecated:: 2016.11.0
device
The name of the block device

10
salt/modules/boto_asg.py
View file

@ -655,7 +655,7 @@ def get_all_groups(region=None, key=None, keyid=None, profile=None):
Return all AutoScale Groups visible in the account
(as a list of boto.ec2.autoscale.group.AutoScalingGroup).
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI example:
@ -683,7 +683,7 @@ def list_groups(region=None, key=None, keyid=None, profile=None):
Return all AutoScale Groups visible in the account
(as a list of names).
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI example:
@ -740,11 +740,12 @@ def enter_standby(name, instance_ids, should_decrement_desired_capacity=False,
'''
Switch desired instances to StandBy mode
.. versionadded:: 2016.11.0
CLI example::
salt-call boto_asg.enter_standby my_autoscale_group_name '["i-xxxxxx"]'
.. versionadded:: Carbon
'''
conn = _get_conn_autoscaling_boto3(
region=region, key=key, keyid=keyid, profile=profile)
@ -766,11 +767,12 @@ def exit_standby(name, instance_ids, should_decrement_desired_capacity=False,
'''
Exit desired instances from StandBy mode
.. versionadded:: 2016.11.0
CLI example::
salt-call boto_asg.exit_standby my_autoscale_group_name '["i-xxxxxx"]'
.. versionadded:: Carbon
'''
conn = _get_conn_autoscaling_boto3(
region=region, key=key, keyid=keyid, profile=profile)

2
salt/modules/boto_cognitoidentity.py
View file

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

22
salt/modules/boto_ec2.py
View file

@ -1656,6 +1656,8 @@ def get_all_volumes(volume_ids=None, filters=None, return_objs=False,
'''
Get a list of all EBS volumes, optionally filtered by provided 'filters' param
.. versionadded:: 2016.11.0
volume_ids
(list) - Optional list of volume_ids. If provided, only the volumes
associated with those in the list will be returned.
@ -1690,7 +1692,6 @@ def get_all_volumes(volume_ids=None, filters=None, return_objs=False,
salt-call boto_ec2.get_all_volumes filters='{"tag:Name": "myVolume01"}'
.. versionadded:: Carbon
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
@ -1705,6 +1706,8 @@ def get_all_volumes(volume_ids=None, filters=None, return_objs=False,
def set_volumes_tags(tag_maps, authoritative=False, dry_run=False,
region=None, key=None, keyid=None, profile=None):
'''
.. versionadded:: 2016.11.0
tag_maps (list)
List of dicts of filters and tags, where 'filters' is a dict suitable for passing to the
'filters' argument of get_all_volumes() above, and 'tags' is a dict of tags to be set on
@ -1752,7 +1755,6 @@ def set_volumes_tags(tag_maps, authoritative=False, dry_run=False,
returns (dict)
A dict dsecribing status and any changes.
.. versionadded:: Carbon
'''
ret = {'success': True, 'comment': '', 'changes': {}}
running_states = ('pending', 'rebooting', 'running', 'stopping', 'stopped')
@ -1827,6 +1829,8 @@ def create_tags(resource_ids, tags, region=None, key=None, keyid=None, profile=N
'''
Create new metadata tags for the specified resource ids.
.. versionadded:: 2016.11.0
resource_ids
(string) or (list) – List of resource IDs. A plain string will be converted to a list of one element.
tags
@ -1841,8 +1845,6 @@ def create_tags(resource_ids, tags, region=None, key=None, keyid=None, profile=N
salt-call boto_ec2.create_tags vol-12345678 '{"Name": "myVolume01"}'
.. versionadded:: Carbon
'''
if not isinstance(resource_ids, list):
resource_ids = [resource_ids]
@ -1860,6 +1862,8 @@ def delete_tags(resource_ids, tags, region=None, key=None, keyid=None, profile=N
'''
Delete metadata tags for the specified resource ids.
.. versionadded:: 2016.11.0
resource_ids
(string) or (list) – List of resource IDs. A plain string will be converted to a list of one element.
tags
@ -1878,8 +1882,6 @@ def delete_tags(resource_ids, tags, region=None, key=None, keyid=None, profile=N
salt-call boto_ec2.delete_tags vol-12345678 '{"Name": "myVolume01"}'
salt-call boto_ec2.delete_tags vol-12345678 '["Name","MountPoint"]'
.. versionadded:: Carbon
'''
if not isinstance(resource_ids, list):
resource_ids = [resource_ids]
@ -1898,6 +1900,8 @@ def detach_volume(volume_id, instance_id=None, device=None, force=False,
'''
Detach an EBS volume from an EC2 instance.
.. versionadded:: 2016.11.0
volume_id
(string) – The ID of the EBS volume to be detached.
instance_id
@ -1920,8 +1924,6 @@ def detach_volume(volume_id, instance_id=None, device=None, force=False,
salt-call boto_ec2.detach_volume vol-12345678 i-87654321
.. versionadded:: Carbon
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:
@ -1936,6 +1938,8 @@ def delete_volume(volume_id, instance_id=None, device=None, force=False,
'''
Detach an EBS volume from an EC2 instance.
.. versionadded:: 2016.11.0
volume_id
(string) – The ID of the EBS volume to be deleted.
force
@ -1950,8 +1954,6 @@ def delete_volume(volume_id, instance_id=None, device=None, force=False,
salt-call boto_ec2.delete_volume vol-12345678
.. versionadded:: Carbon
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
try:

2
salt/modules/boto_elasticsearch_domain.py
View file

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

20
salt/modules/boto_iot.py
View file

@ -114,14 +114,14 @@ def thing_type_exists(thingTypeName,
Returns True if the given thing type exists and returns False if the
given thing type does not exist.
.. versionadded:: 2016.11.0
CLI Example:
.. code-block:: bash
salt myminion boto_iot.thing_type_exists mythingtype
.. versionadded:: Carbon
'''
try:
@ -145,14 +145,14 @@ def describe_thing_type(thingTypeName,
Returns a dictionary of interesting properties.
.. versionadded:: 2016.11.0
CLI Example:
.. code-block:: bash
salt myminion boto_iot.describe_thing_type mythingtype
.. versionadded:: Carbon
'''
try:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
@ -184,6 +184,8 @@ def create_thing_type(thingTypeName, thingTypeDescription,
Returns {created: true} if the thing type was created and returns
{created: False} if the thing type was not created.
.. versionadded:: 2016.11.0
CLI Example:
.. code-block:: bash
@ -191,8 +193,6 @@ def create_thing_type(thingTypeName, thingTypeDescription,
salt myminion boto_iot.create_thing_type mythingtype \\
thingtype_description_string '["searchable_attr_1", "searchable_attr_2"]'
.. versionadded:: Carbon
'''
try:
@ -226,14 +226,14 @@ def deprecate_thing_type(thingTypeName, undoDeprecate=False,
Returns {deprecated: true} if the thing type was deprecated and returns
{deprecated: false} if the thing type was not deprecated.
.. versionadded:: 2016.11.0
CLI Example:
.. code-block:: bash
salt myminion boto_iot.deprecate_thing_type mythingtype
.. versionadded:: Carbon
'''
try:
@ -256,14 +256,14 @@ def delete_thing_type(thingTypeName,
Returns {deleted: true} if the thing type was deleted and returns
{deleted: false} if the thing type was not deleted.
.. versionadded:: 2016.11.0
CLI Example:
.. code-block:: bash
salt myminion boto_iot.delete_thing_type mythingtype
.. versionadded:: Carbon
'''
try:

2
salt/modules/boto_sns.py
View file

@ -188,7 +188,7 @@ def unsubscribe(topic, subscription_arn, region=None, key=None, keyid=None, prof
salt myminion boto_sns.unsubscribe my_topic my_subscription_arn region=us-east-1
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)

4
salt/modules/boto_sqs.py
View file

@ -144,7 +144,7 @@ def get_all_queues(prefix=None, region=None, key=None, keyid=None, profile=None)
'''
Return a list of Queue() objects describing all visible queues.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -164,7 +164,7 @@ def list(prefix=None, region=None, key=None, keyid=None, profile=None):
'''
Return a list of the names of all visible queues.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:

41
salt/modules/boto_vpc.py
View file

@ -71,7 +71,7 @@ Connection module for Amazon VPC
:depends: boto
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Functions to request, accept, delete and describe VPC peering connections.
Named VPC peering connections can be requested using these modules.
@ -1259,7 +1259,7 @@ def nat_gateway_exists(nat_gateway_id=None, subnet_id=None, subnet_name=None,
This function requires boto3 to be installed.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -1321,7 +1321,7 @@ def create_nat_gateway(subnet_id=None,
Returns the nat gateway id if the nat gateway was created and
returns False if the nat gateway was not created.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -1372,7 +1372,7 @@ def delete_nat_gateway(nat_gateway_id,
This function requires boto3 to be installed.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
nat_gateway_id
Id of the NAT Gateway
@ -2507,7 +2507,7 @@ def describe_route_tables(route_table_id=None, route_table_name=None,
This function requires boto3 to be installed.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -2659,7 +2659,7 @@ def _get_subnet_explicit_route_table(subnet_id, vpc_id, conn=None, region=None,
'''
helper function to find subnet explicit route table associations
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
if not conn:
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
@ -2679,6 +2679,8 @@ def request_vpc_peering_connection(requester_vpc_id=None, requester_vpc_name=Non
'''
Request a VPC peering connection between two VPCs.
.. versionadded:: 2016.11.0
requester_vpc_id
ID of the requesting VPC. Exclusive with requester_vpc_name.
@ -2717,8 +2719,6 @@ def request_vpc_peering_connection(requester_vpc_id=None, requester_vpc_name=Non
dry_run
If True, skip application and return status.
.. versionadded:: Carbon
CLI Example:
.. code-block:: bash
@ -2821,9 +2821,12 @@ def describe_vpc_peering_connection(name,
'''
Returns any VPC peering connection id(s) for the given VPC
peering connection name.
VPC peering connection ids are only returned for connections that
are in the
``active``, ``pending-acceptance`` or ``provisioning`` state.
are in the ``active``, ``pending-acceptance`` or ``provisioning``
state.
.. versionadded:: 2016.11.0
:param name: The string name for this VPC peering connection
:param region: The aws region to use
@ -2832,8 +2835,6 @@ def describe_vpc_peering_connection(name,
:param profile: The profile to use
:return: dict
.. versionadded:: Carbon
CLI Example:
.. code-block:: bash
@ -2861,6 +2862,8 @@ def accept_vpc_peering_connection( # pylint: disable=too-many-arguments
'''
Request a VPC peering connection between two VPCs.
.. versionadded:: 2016.11.0
:param conn_id: The ID to use. String type.
:param name: The name of this VPC peering connection. String type.
:param region: The AWS region to use. Type string.
@ -2873,8 +2876,6 @@ def accept_vpc_peering_connection( # pylint: disable=too-many-arguments
Warning: Please specify either the ``vpc_peering_connection_id`` or
``name`` but not both. Specifying both will result in an error!
.. versionadded:: Carbon
CLI Example:
.. code-block:: bash
@ -2939,6 +2940,8 @@ def delete_vpc_peering_connection(conn_id=None, conn_name=None, region=None,
'''
Delete a VPC peering connection.
.. versionadded:: 2016.11.0
conn_id
The connection ID to check. Exclusive with conn_name.
@ -2961,8 +2964,6 @@ def delete_vpc_peering_connection(conn_id=None, conn_name=None, region=None,
dry_run
If True, skip application and simply return projected status.
.. versionadded:: Carbon
CLI Example:
.. code-block:: bash
@ -3000,6 +3001,8 @@ def is_peering_connection_pending(conn_id=None, conn_name=None, region=None,
'''
Check if a VPC peering connection is in the pending state.
.. versionadded:: 2016.11.0
conn_id
The connection ID to check. Exclusive with conn_name.
@ -3019,8 +3022,6 @@ def is_peering_connection_pending(conn_id=None, conn_name=None, region=None,
A dict with region, key and keyid, or a pillar key (string) that
contains a dict with region, key and keyid.
.. versionadded:: Carbon
CLI Example:
.. code-block:: bash
@ -3062,6 +3063,8 @@ def peering_connection_pending_from_vpc(conn_id=None, conn_name=None, vpc_id=Non
'''
Check if a VPC peering connection is in the pending state, and requested from the given VPC.
.. versionadded:: 2016.11.0
conn_id
The connection ID to check. Exclusive with conn_name.
@ -3087,8 +3090,6 @@ def peering_connection_pending_from_vpc(conn_id=None, conn_name=None, vpc_id=Non
A dict with region, key and keyid, or a pillar key (string) that
contains a dict with region, key and keyid.
.. versionadded:: Carbon
CLI Example:
.. code-block:: bash

3
salt/modules/cassandra_cql.py
View file

@ -32,7 +32,8 @@ Cassandra Database Module
port: 9000
username: cas_admin
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
Added support for ``ssl_options`` and ``protocol_version``.
Example configuration with

2
salt/modules/ceph.py
View file

@ -4,7 +4,7 @@ Module to provide ceph control with salt.
:depends: - ceph_cfg Python module
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
# Import Python Libs
from __future__ import absolute_import

2
salt/modules/cisconso.py
View file

@ -2,7 +2,7 @@
'''
Execution module for Cisco Network Services Orchestrator Proxy minions
.. versionadded: Carbon
.. versionadded: 2016.11.0
For documentation on setting up the cisconso proxy minion look in the documentation
for :doc:`salt.proxy.cisconso</ref/proxy/all/salt.proxy.cisconso>`.

102
salt/modules/cmdmod.py
View file

@ -26,6 +26,7 @@ import tempfile
# Import salt libs
import salt.utils
import salt.utils.files
import salt.utils.powershell
import salt.utils.timed_subprocess
import salt.grains.extra
import salt.ext.six as six
@ -2062,7 +2063,7 @@ def script(source,
'Oxygen',
'Parameter \'__env__\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('__env__')
@ -2278,7 +2279,7 @@ def script_retcode(source,
'Oxygen',
'Parameter \'__env__\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('__env__')
@ -2667,16 +2668,24 @@ def shells():
return ret
def shell_info(shell):
def shell_info(shell, list_modules=False):
'''
Provides information about a shell or script languages which often use ``#!``.
The values returned are dependant on the shell or scripting languages all return the
``installed``, ``path``, ``version``, ``version_raw``
.. versionadded:: 2016.11.0
:param str shell: Name of the shell. Support shells/script languages include
Provides information about a shell or script languages which often use
``#!``. The values returned are dependant on the shell or scripting
languages all return the ``installed``, ``path``, ``version``,
``version_raw``
Args:
shell (str): Name of the shell. Support shells/script languages include
bash, cmd, perl, php, powershell, python, ruby and zsh
:return: Properties of the shell specifically its and other information if available.
:rtype: dict
list_modules (bool): True to list modules available to the shell.
Currently only lists powershell modules.
Returns:
dict: A dictionary of information about the shell
.. code-block:: python
@ -2686,14 +2695,12 @@ def shell_info(shell):
'installed': <True, False or None>,
'<attribute>': '<attribute value>'}
..
.. note::
* ``installed`` is always returned, if ``None`` or ``False`` also returns error and may also return ``stdout`` for diagnostics.
* ``version`` is for use in determine if a shell/script language has a particular feature set, not for package management.
* The shell must be within the exeuctable search path.
.. versionadded:: Carbon
- ``installed`` is always returned, if ``None`` or ``False`` also
returns error and may also return ``stdout`` for diagnostics.
- ``version`` is for use in determine if a shell/script language has a
particular feature set, not for package management.
- The shell must be within the executable search path.
CLI Example:
@ -2702,8 +2709,6 @@ def shell_info(shell):
salt '*' cmd.shell_info bash
salt '*' cmd.shell_info powershell
..
:codeauthor: Damon Atkins <https://github.com/damon-atkins>
'''
regex_shells = {
@ -2720,22 +2725,37 @@ def shell_info(shell):
'php': [r'^PHP (\d\S*)', 'php', '-v']
}
# Ensure ret['installed'] always as a value of True, False or None (not sure)
ret = {}
ret['installed'] = False
ret = {'installed': False}
if salt.utils.is_windows() and shell == 'powershell':
pw_keys = __salt__['reg.list_keys']('HKEY_LOCAL_MACHINE', 'Software\\Microsoft\\PowerShell')
pw_keys = __salt__['reg.list_keys'](
'HKEY_LOCAL_MACHINE',
'Software\\Microsoft\\PowerShell')
pw_keys.sort(key=int)
if len(pw_keys) == 0:
return {
'error': 'Unable to locate \'powershell\' Reason: Cannot be found in registry.',
'error': 'Unable to locate \'powershell\' Reason: Cannot be '
'found in registry.',
'installed': False,
}
for reg_ver in pw_keys:
install_data = __salt__['reg.read_value']('HKEY_LOCAL_MACHINE', 'Software\\Microsoft\\PowerShell\\{0}'.format(reg_ver), 'Install')
if 'vtype' in install_data and install_data['vtype'] == 'REG_DWORD' and install_data['vdata'] == 1:
details = __salt__['reg.list_values']('HKEY_LOCAL_MACHINE', 'Software\\Microsoft\\PowerShell\\{0}\\PowerShellEngine'.format(reg_ver))
ret = {} # reset data, want the newest version details only as powershell is backwards compatible
ret['installed'] = None # if all goes well this will become True
install_data = __salt__['reg.read_value'](
'HKEY_LOCAL_MACHINE',
'Software\\Microsoft\\PowerShell\\{0}'.format(reg_ver),
'Install')
if 'vtype' in install_data and \
install_data['vtype'] == 'REG_DWORD' and \
install_data['vdata'] == 1:
details = __salt__['reg.list_values'](
'HKEY_LOCAL_MACHINE',
'Software\\Microsoft\\PowerShell\\{0}\\'
'PowerShellEngine'.format(reg_ver))
# reset data, want the newest version details only as powershell
# is backwards compatible
ret = {}
# if all goes well this will become True
ret['installed'] = None
ret['path'] = which('powershell.exe')
for attribute in details:
if attribute['vname'].lower() == '(default)':
@ -2745,26 +2765,30 @@ def shell_info(shell):
ret['version_raw'] = attribute['vdata']
elif attribute['vname'].lower() == 'runtimeversion':
ret['crlversion'] = attribute['vdata']
if ret['crlversion'][0] == 'v' or ret['crlversion'][0] == 'V':
if ret['crlversion'][0].lower() == 'v':
ret['crlversion'] = ret['crlversion'][1::]
elif attribute['vname'].lower() == 'pscompatibleversion':
# reg attribute does not end in s, the powershell attibute does
ret['pscompatibleversions'] = attribute['vdata'].replace(' ', '').split(',')
# reg attribute does not end in s, the powershell
# attribute does
ret['pscompatibleversions'] = \
attribute['vdata'].replace(' ', '').split(',')
else:
# keys are lower case as python is case sensitive the registry is not
# keys are lower case as python is case sensitive the
# registry is not
ret[attribute['vname'].lower()] = attribute['vdata']
else:
if shell not in regex_shells:
return {
'error': 'Salt does not know how to get the version number for {0}'.format(shell),
'error': 'Salt does not know how to get the version number for '
'{0}'.format(shell),
'installed': None
}
shell_data = regex_shells[shell]
pattern = shell_data.pop(0)
# We need to make sure HOME set, so shells work correctly
# salt-call will general have home set, the salt-minion service may not
# We need to assume ports of unix shells to windows will look after themselves
# in setting HOME as they do it in many different ways
# We need to assume ports of unix shells to windows will look after
# themselves in setting HOME as they do it in many different ways
newenv = os.environ
if ('HOME' not in newenv) and (not salt.utils.is_windows()):
newenv['HOME'] = os.path.expanduser('~')
@ -2806,10 +2830,16 @@ def shell_info(shell):
ver_list.append('0')
ret['version'] = '.'.join(ver_list[:3])
else:
ret['installed'] = None # Have an unexpect result
ret['installed'] = None # Have an unexpected result
# Get a list of the PowerShell modules which are potentially available
# to be imported
if shell == 'powershell' and ret['installed'] and list_modules:
ret['modules'] = salt.utils.powershell.get_modules()
if 'version' not in ret:
ret['error'] = 'The version regex pattern for shell {0}, could not find the version string'.format(shell)
ret['error'] = 'The version regex pattern for shell {0}, could not ' \
'find the version string'.format(shell)
ret['stdout'] = proc.stdout # include stdout so they can see the issue
log.error(ret['error'])

2
salt/modules/debconfmod.py
View file

@ -188,7 +188,7 @@ def set_file(path, saltenv='base', **kwargs):
'Oxygen',
'Parameter \'__env__\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('__env__')

4
salt/modules/disk.py
View file

@ -380,7 +380,7 @@ def format_(device,
'''
Format a filesystem onto a device
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
device
The device in which to create the new filesystem
@ -443,7 +443,7 @@ def fstype(device):
'''
Return the filesystem name of the specified device
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
device
The name of the device

2
salt/modules/dockerio.py
View file

@ -2176,7 +2176,7 @@ def _script(status,
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')

6
salt/modules/dockerng.py
View file

@ -5723,7 +5723,7 @@ def call(name, function, *args, **kwargs):
The container does not need to have Salt installed, but Python
is required.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
# where to put the salt-thin
@ -5794,7 +5794,7 @@ def sls(name, mods=None, saltenv='base', **kwargs):
The container does not need to have Salt installed, but Python
is required.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
mods = [item.strip() for item in mods.split(',')] if mods else []
@ -5866,7 +5866,7 @@ def sls_build(name, base='opensuse/python', mods=None, saltenv='base',
The base image does not need to have Salt installed, but Python
is required.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
# start a new container

10
salt/modules/ebuild.py
View file

@ -463,7 +463,7 @@ def install(name=None,
binhost=None,
**kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -706,7 +706,7 @@ def install(name=None,
def update(pkg, slot=None, fromrepo=None, refresh=False, binhost=None):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -799,7 +799,7 @@ def update(pkg, slot=None, fromrepo=None, refresh=False, binhost=None):
def upgrade(refresh=True, binhost=None, backtrack=3):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -889,7 +889,7 @@ def upgrade(refresh=True, binhost=None, backtrack=3):
def remove(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -988,7 +988,7 @@ def remove(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs):
def purge(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd

2
salt/modules/eselect.py
View file

@ -99,7 +99,7 @@ def get_target_list(module, action_parameter=None):
action_parameter
additional params passed to the defined action
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:

20
salt/modules/firewalld.py
View file

@ -73,7 +73,7 @@ def reload_rules():
Reload the firewall rules, which makes the permanent configuration the new
runtime configuration without losing state information.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -438,7 +438,7 @@ def add_service_port(service, port):
'''
Add a new port to the specified service.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -457,7 +457,7 @@ def remove_service_port(service, port):
'''
Remove a port from the specified service.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -476,7 +476,7 @@ def get_service_ports(service):
'''
List ports of a service.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -492,7 +492,7 @@ def add_service_protocol(service, protocol):
'''
Add a new protocol to the specified service.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -509,7 +509,7 @@ def remove_service_protocol(service, protocol):
'''
Remove a protocol from the specified service.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -526,7 +526,7 @@ def get_service_protocols(service):
'''
List protocols of a service.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -994,7 +994,7 @@ def get_rich_rules(zone, permanent=True):
'''
List rich rules bound to a zone
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -1014,7 +1014,7 @@ def add_rich_rule(zone, rule, permanent=True):
'''
Add a rich rule to a zone
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -1034,7 +1034,7 @@ def remove_rich_rule(zone, rule, permanent=True):
'''
Add a rich rule to a zone
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:

2
salt/modules/git.py
View file

@ -1515,7 +1515,7 @@ def diff(cwd,
cached=False,
paths=None):
'''
.. versionadded:: 2015.8.12,2016.3.3,Carbon
.. versionadded:: 2015.8.12,2016.3.3,2016.11.0
Interface to `git-diff(1)`_

50
salt/modules/github.py
View file

@ -169,7 +169,7 @@ def list_users(profile="github", ignore_cache=False):
ignore_cache
Bypasses the use of cached users.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -330,7 +330,7 @@ def get_issue(issue_number, repo_name=None, profile='github', output='min'):
'''
Return information about a single issue in a named repository.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
issue_number
The number of the issue to retrieve.
@ -382,7 +382,7 @@ def get_issue_comments(issue_number,
'''
Return information about the comments for a given issue in a named repository.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
issue_number
The number of the issue for which to retrieve comments.
@ -453,7 +453,7 @@ def get_issues(repo_name=None,
'''
Returns information for all issues in a given repository, based on the search options.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
repo_name
The name of the repository for which to list issues. This argument is
@ -578,7 +578,7 @@ def get_milestones(repo_name=None,
'''
Return information about milestones for a given repository.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
repo_name
The name of the repository for which to list issues. This argument is
@ -658,7 +658,7 @@ def get_milestone(number=None,
'''
Return information about a single milestone in a named repository.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
number
The number of the milestone to retrieve. If provided, this option
@ -753,7 +753,7 @@ def get_repo_info(repo_name, profile='github', ignore_cache=False):
'''
Return information for a given repo.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
repo_name
The name of the repository.
@ -852,7 +852,7 @@ def list_repos(profile='github'):
repositories within the organization Dependent upon the access rights of
the profile token.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
profile
The name of the profile configuration to use. Defaults to ``github``.
@ -872,7 +872,7 @@ def list_private_repos(profile='github'):
List private repositories within the organization. Dependent upon the access
rights of the profile token.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
profile
The name of the profile configuration to use. Defaults to ``github``.
@ -895,7 +895,7 @@ def list_public_repos(profile='github'):
'''
List public repositories within the organization.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
profile
The name of the profile configuration to use. Defaults to ``github``.
@ -968,7 +968,7 @@ def add_repo(name,
salt myminion github.add_repo 'repo_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
try:
client = _get_client(profile)
@ -1044,7 +1044,7 @@ def edit_repo(name,
salt myminion github.add_repo 'repo_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
try:
@ -1105,7 +1105,7 @@ def remove_repo(name, profile="github"):
salt myminion github.remove_repo 'my-repo'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
repo_info = get_repo_info(name, profile=profile)
if not repo_info:
@ -1179,7 +1179,7 @@ def add_team(name,
salt myminion github.add_team 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
try:
client = _get_client(profile)
@ -1240,7 +1240,7 @@ def edit_team(name,
salt myminion github.edit_team 'team_name' description='Team description'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
team = get_team(name, profile=profile)
if not team:
@ -1290,7 +1290,7 @@ def remove_team(name, profile="github"):
salt myminion github.remove_team 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
team_info = get_team(name, profile=profile)
if not team_info:
@ -1329,7 +1329,7 @@ def list_team_repos(team_name, profile="github", ignore_cache=False):
salt myminion github.list_team_repos 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
cached_team = get_team(team_name, profile=profile)
if not cached_team:
@ -1393,7 +1393,7 @@ def add_team_repo(repo_name, team_name, profile="github", permission=None):
salt myminion github.add_team_repo 'my_repo' 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
team = get_team(team_name, profile=profile)
if not team:
@ -1442,7 +1442,7 @@ def remove_team_repo(repo_name, team_name, profile="github"):
salt myminion github.remove_team_repo 'my_repo' 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
team = get_team(team_name, profile=profile)
if not team:
@ -1481,7 +1481,7 @@ def list_team_members(team_name, profile="github", ignore_cache=False):
salt myminion github.list_team_members 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
cached_team = get_team(team_name, profile=profile)
if not cached_team:
@ -1524,7 +1524,7 @@ def list_members_without_mfa(profile="github", ignore_cache=False):
salt myminion github.list_members_without_mfa
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
key = "github.{0}:non_mfa_users".format(
_get_config_value(profile, 'org_name')
@ -1567,7 +1567,7 @@ def is_team_member(name, team_name, profile="github"):
salt myminion github.is_team_member 'user_name' 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
return name.lower() in list_team_members(team_name, profile=profile)
@ -1591,7 +1591,7 @@ def add_team_member(name, team_name, profile="github"):
salt myminion github.add_team_member 'user_name' 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
team = get_team(team_name, profile=profile)
if not team:
@ -1642,7 +1642,7 @@ def remove_team_member(name, team_name, profile="github"):
salt myminion github.remove_team_member 'user_name' 'team_name'
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
team = get_team(team_name, profile=profile)
if not team:
@ -1684,7 +1684,7 @@ def list_teams(profile="github", ignore_cache=False):
salt myminion github.list_teams
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
key = 'github.{0}:teams'.format(
_get_config_value(profile, 'org_name')

6
salt/modules/grains.py
View file

@ -98,7 +98,7 @@ def get(key, default='', delimiter=DEFAULT_TARGET_DELIM, ordered=True):
:param ordered:
Outputs an ordered dict if applicable (default: True)
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:
@ -515,7 +515,7 @@ def filter_by(lookup_dict, grain='os_family', merge=None, default='default', bas
could be the grain for an OS and the value could the name of a package
on that particular OS.
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
The dictionary key could be a globbing pattern. The function will
return the corresponding ``lookup_dict`` value where grain value
@ -531,7 +531,7 @@ def filter_by(lookup_dict, grain='os_family', merge=None, default='default', bas
system could be used to pull values from the ``lookup_dict``
dictionary.
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
The grain value could be a list. The function will return the
``lookup_dict`` value for a first found item in the list matching

2
salt/modules/haproxyconn.py
View file

@ -266,7 +266,7 @@ def show_backends(socket='/var/run/haproxy.sock'):
def get_sessions(name, backend, socket='/var/run/haproxy.sock'):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Get number of current sessions on server in backend (scur)

2
salt/modules/ini_manage.py
View file

@ -60,7 +60,7 @@ def set_option(file_name, sections=None, separator='='):
A character used to separate keys and values. Standard ini files use
the "=" character.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
API Example:

2
salt/modules/jenkins.py
View file

@ -424,7 +424,7 @@ def get_job_config(name=None):
def plugin_installed(name):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Return if the plugin is installed for the provided plugin name.

2
salt/modules/kapacitor.py
View file

@ -12,7 +12,7 @@ Kapacitor execution module.
This data can also be passed into pillar. Options passed into opts will
overwrite options passed into pillar.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
from __future__ import absolute_import

10
salt/modules/keystone.py
View file

@ -594,7 +594,7 @@ def project_create(name, domain, description=None, enabled=True, profile=None,
Create a keystone project.
Overrides keystone tenant_create form api V2. For keystone api V3.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
name
The project name, which must be unique within the owning domain.
@ -657,7 +657,7 @@ def project_delete(project_id=None, name=None, profile=None, **connection_args):
Delete a project (keystone project-delete).
Overrides keystone tenant-delete form api V2. For keystone api V3 only.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
project_id
The project id.
@ -720,7 +720,7 @@ def project_get(project_id=None, name=None, profile=None, **connection_args):
Overrides keystone tenant-get form api V2.
For keystone api V3 only.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
project_id
The project id.
@ -773,7 +773,7 @@ def project_list(profile=None, **connection_args):
Overrides keystone tenants-list form api V2.
For keystone api V3 only.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
profile
Configuration profile - if configuration for multiple openstack accounts required.
@ -840,7 +840,7 @@ def project_update(project_id=None, name=None, description=None,
Overrides keystone tenant_update form api V2.
For keystone api V3 only.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
project_id
The project id.

2
salt/modules/libcloud_dns.py
View file

@ -2,7 +2,7 @@
'''
Connection module for Apache Libcloud DNS management
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:configuration:
This module uses a configuration profile for one or multiple DNS providers

4
salt/modules/mac_user.py
View file

@ -440,11 +440,11 @@ def list_groups(name):
name
The name of the user for which to list groups. Starting in Salt Carbon,
The name of the user for which to list groups. Starting in Salt 2016.11.0,
all groups for the user, including groups beginning with an underscore
will be listed.
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
CLI Example:

2
salt/modules/mongodb.py
View file

@ -435,7 +435,7 @@ def update_one(objects, collection, user=None, password=None, host=None, port=No
Update an object into a collection
http://api.mongodb.com/python/current/api/pymongo/collection.html#pymongo.collection.Collection.update_one
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
CLI Example:

2
salt/modules/napalm_bgp.py
View file

@ -15,7 +15,7 @@ Dependencies
- :mod:`napalm proxy minion <salt.proxy.napalm>`
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
from __future__ import absolute_import

2
salt/modules/napalm_network.py
View file

@ -15,7 +15,7 @@ Dependencies
- :mod:`napalm proxy minion <salt.proxy.napalm>`
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
from __future__ import absolute_import

2
salt/modules/napalm_ntp.py
View file

@ -17,7 +17,7 @@ Dependencies
.. seealso::
:mod:`NTP peers management state <salt.states.netntp>`
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
from __future__ import absolute_import

2
salt/modules/napalm_probes.py
View file

@ -15,7 +15,7 @@ Dependencies
- :mod:`napalm proxy minion <salt.proxy.napalm>`
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
'''
from __future__ import absolute_import

2
salt/modules/nxos.py
View file

@ -2,7 +2,7 @@
'''
Execution module for Cisco NX OS Switches Proxy minions
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
For documentation on setting up the nxos proxy minion look in the documentation
for :mod:`salt.proxy.nxos <salt.proxy.nxos>`.

14
salt/modules/pacman.py
View file

@ -238,7 +238,7 @@ def list_pkgs(versions_as_list=False, **kwargs):
def group_list():
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Lists all groups known by pacman on this system
@ -312,7 +312,7 @@ def group_list():
def group_info(name):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Lists all packages in the specified group
@ -351,7 +351,7 @@ def group_info(name):
def group_diff(name):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Lists which of a group's packages are installed and which are not
installed
@ -438,7 +438,7 @@ def install(name=None,
sources=None,
**kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -601,7 +601,7 @@ def install(name=None,
def upgrade(refresh=False, root=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -720,7 +720,7 @@ def _uninstall(action='remove', name=None, pkgs=None, **kwargs):
def remove(name=None, pkgs=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd
@ -764,7 +764,7 @@ def remove(name=None, pkgs=None, **kwargs):
def purge(name=None, pkgs=None, **kwargs):
'''
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
.. versionchanged:: 2015.8.12,2016.3.3,2016.11.0
On minions running systemd>=205, `systemd-run(1)`_ is now used to
isolate commands which modify installed packages from the
``salt-minion`` daemon's control group. This is done to keep systemd

14
salt/modules/parallels.py
View file

@ -94,7 +94,7 @@ def prlsrvctl(sub_cmd, args=None, runas=None):
'''
Execute a prlsrvctl command
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param str sub_cmd:
prlsrvctl subcommand to execute
@ -159,7 +159,7 @@ def list_vms(name=None, info=False, all=False, args=None, runas=None, template=F
:param str name:
Name/ID of VM to list
.. versionchanged:: Carbon
.. versionchanged:: 2016.11.0
No longer implies ``info=True``
@ -179,7 +179,7 @@ def list_vms(name=None, info=False, all=False, args=None, runas=None, template=F
List the available virtual machine templates. The real virtual
machines will not be included in the output
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Example:
@ -213,7 +213,7 @@ def clone(name, new_name, linked=False, template=False, runas=None):
'''
Clone a VM
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param str name:
Name/ID of VM to clone
@ -249,7 +249,7 @@ def delete(name, runas=None):
'''
Delete a VM
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param str name:
Name/ID of VM to clone
@ -270,7 +270,7 @@ def exists(name, runas=None):
'''
Query whether a VM exists
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param str name:
Name/ID of VM
@ -711,7 +711,7 @@ def delete_snapshot(name, snap_name, runas=None, all=False):
:param bool all:
Delete all snapshots having the name given
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Example:

2
salt/modules/pkg_resource.py
View file

@ -108,7 +108,7 @@ def parse_targets(name=None,
'Oxygen',
'Parameter \'__env__\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('__env__')

8
salt/modules/rdp.py
View file

@ -105,7 +105,7 @@ def list_sessions(logged_in_users_only=False):
'''
List information about the sessions.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param logged_in_users_only: If True, only return sessions with users logged in.
:return: A list containing dictionaries of session information.
@ -156,7 +156,7 @@ def get_session(session_id):
'''
Get information about a session.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param session_id: The numeric Id of the session.
:return: A dictionary of session information.
@ -186,7 +186,7 @@ def disconnect_session(session_id):
'''
Disconnect a session.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param session_id: The numeric Id of the session.
:return: A boolean representing whether the disconnect succeeded.
@ -212,7 +212,7 @@ def logoff_session(session_id):
'''
Initiate the logoff of a session.
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:param session_id: The numeric Id of the session.
:return: A boolean representing whether the logoff succeeded.

2
salt/modules/servicenow.py
View file

@ -2,7 +2,7 @@
'''
Module for execution of ServiceNow CI (configuration items)
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
:depends: servicenow_rest python module

4
salt/modules/shadow.py
View file

@ -206,7 +206,7 @@ def del_password(name):
def lock_password(name):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Lock the password from name user
@ -232,7 +232,7 @@ def lock_password(name):
def unlock_password(name):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Unlock the password from name user

2
salt/modules/smartos_nictagadm.py
View file

@ -6,7 +6,7 @@ Module for running nictagadm command on SmartOS
:depends: nictagadm binary, dladm binary
:platform: smartos
..versionadded:: Carbon
..versionadded:: 2016.11.0
'''
from __future__ import absolute_import

14
salt/modules/state.py
View file

@ -164,7 +164,7 @@ def orchestrate(mods,
pillar=None,
pillarenv=None):
'''
.. versionadded:: Carbon
.. versionadded:: 2016.11.0
Execute the orchestrate runner from a masterless minion.
@ -366,7 +366,7 @@ def template(tem, queue=False, **kwargs):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -767,7 +767,7 @@ def highstate(test=None,
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -929,7 +929,7 @@ def sls(mods,
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -1312,7 +1312,7 @@ def show_low_sls(mods,
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -1365,7 +1365,7 @@ def show_sls(mods, saltenv='base', test=None, queue=False, **kwargs):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')
@ -1425,7 +1425,7 @@ def show_top(queue=False, **kwargs):
'Oxygen',
'Parameter \'env\' has been detected in the argument list. This '
'parameter is no longer used and has been replaced by \'saltenv\' '
'as of Salt Carbon. This warning will be removed in Salt Oxygen.'
'as of Salt 2016.11.0. This warning will be removed in Salt Oxygen.'
)
kwargs.pop('env')

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