mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
Change "Helium" to 2014.7.0 in affected docs
This commit is contained in:
rallytime
parent
146930e021
commit
a8cd830d52
@ -432,7 +432,7 @@ public keys from minions.
|
||||
``autosign_timeout``
|
||||
--------------------
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``120``
|
||||
|
||||
@ -462,7 +462,7 @@ that trust is based on just the requesting minion id.
|
||||
``autoreject_file``
|
||||
-------------------
|
||||
|
||||
.. versionadded:: 2014.1.0 (Hydrogen)
|
||||
.. versionadded:: 2014.1.0
|
||||
|
||||
Default: ``not defined``
|
||||
|
||||
@ -944,8 +944,7 @@ translated into salt environments.
|
||||
|
||||
.. note::
|
||||
|
||||
As of the upcoming **Helium** release (and right now in the development
|
||||
branch), it is possible to have per-repo versions of the
|
||||
As of 2014.7.0, it is possible to have per-repo versions of the
|
||||
:conf_master:`gitfs_base`, :conf_master:`gitfs_root`, and
|
||||
:conf_master:`gitfs_mountpoint` parameters. For example:
|
||||
|
||||
@ -968,7 +967,7 @@ For more information on GitFS remotes, see the :ref:`GitFS Backend Walkthrough
|
||||
``gitfs_provider``
|
||||
******************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``gitpython``
|
||||
|
||||
@ -1008,7 +1007,7 @@ is a security concern, you may want to try using the ssh transport.
|
||||
``gitfs_mountpoint``
|
||||
********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``''``
|
||||
|
||||
@ -1042,7 +1041,7 @@ available to the Salt fileserver. Can be used in conjunction with
|
||||
|
||||
gitfs_root: somefolder/otherfolder
|
||||
|
||||
.. versionchanged:: Helium
|
||||
.. versionchanged:: 2014.7.0
|
||||
|
||||
Ability to specify gitfs roots on a per-remote basis was added. See
|
||||
:conf_master:`here <gitfs_remotes>` for more info.
|
||||
@ -1056,7 +1055,7 @@ Default: ``master``
|
||||
|
||||
Defines which branch/tag should be used as the ``base`` environment.
|
||||
|
||||
.. versionchanged:: Helium
|
||||
.. versionchanged:: 2014.7.0
|
||||
Can also be configured on a per-remote basis, see :conf_master:`here
|
||||
<gitfs_remotes>` for more info.
|
||||
|
||||
@ -1069,7 +1068,7 @@ Defines which branch/tag should be used as the ``base`` environment.
|
||||
``gitfs_env_whitelist``
|
||||
***********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1097,7 +1096,7 @@ blacklist will be exposed as fileserver environments.
|
||||
``gitfs_env_blacklist``
|
||||
***********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1147,8 +1146,7 @@ translated into salt environments, as defined by the
|
||||
|
||||
.. note::
|
||||
|
||||
As of the upcoming **Helium** release (and right now in the development
|
||||
branch), it is possible to have per-repo versions of the
|
||||
As of 2014.7.0, it is possible to have per-repo versions of the
|
||||
:conf_master:`hgfs_root`, :conf_master:`hgfs_mountpoint`,
|
||||
:conf_master:`hgfs_base`, and :conf_master:`hgfs_branch_method` parameters.
|
||||
For example:
|
||||
@ -1186,10 +1184,10 @@ Defines the objects that will be used as fileserver environments.
|
||||
|
||||
.. note::
|
||||
|
||||
Starting in version 2014.1.0 (Hydrogen), the value of the
|
||||
:conf_master:`hgfs_base` parameter defines which branch is used as the
|
||||
``base`` environment, allowing for a ``base`` environment to be used with
|
||||
an :conf_master:`hgfs_branch_method` of ``bookmarks``.
|
||||
Starting in version 2014.1.0, the value of the :conf_master:`hgfs_base`
|
||||
parameter defines which branch is used as the ``base`` environment,
|
||||
allowing for a ``base`` environment to be used with an
|
||||
:conf_master:`hgfs_branch_method` of ``bookmarks``.
|
||||
|
||||
Prior to this release, the ``default`` branch will be used as the ``base``
|
||||
environment.
|
||||
@ -1199,7 +1197,7 @@ Defines the objects that will be used as fileserver environments.
|
||||
``hgfs_mountpoint``
|
||||
*******************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``''``
|
||||
|
||||
@ -1235,7 +1233,7 @@ available to the Salt fileserver. Can be used in conjunction with
|
||||
|
||||
hgfs_root: somefolder/otherfolder
|
||||
|
||||
.. versionchanged:: Helium
|
||||
.. versionchanged:: 2014.7.0
|
||||
|
||||
Ability to specify hgfs roots on a per-remote basis was added. See
|
||||
:conf_master:`here <hgfs_remotes>` for more info.
|
||||
@ -1245,7 +1243,7 @@ available to the Salt fileserver. Can be used in conjunction with
|
||||
``hgfs_base``
|
||||
*************
|
||||
|
||||
.. versionadded:: 2014.1.0 (Hydrogen)
|
||||
.. versionadded:: 2014.1.0
|
||||
|
||||
Default: ``default``
|
||||
|
||||
@ -1262,7 +1260,7 @@ bookmark should be used as the ``base`` environment.
|
||||
``hgfs_env_whitelist``
|
||||
**********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1290,7 +1288,7 @@ blacklist will be exposed as fileserver environments.
|
||||
``hgfs_env_blacklist``
|
||||
**********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1340,8 +1338,7 @@ become environments, with the trunk being the ``base`` environment.
|
||||
|
||||
.. note::
|
||||
|
||||
As of the upcoming **Helium** release (and right now in the development
|
||||
branch), it is possible to have per-repo versions of the following
|
||||
As of 2014.7.0, it is possible to have per-repo versions of the following
|
||||
configuration parameters:
|
||||
|
||||
* :conf_master:`svnfs_root`
|
||||
@ -1369,7 +1366,7 @@ become environments, with the trunk being the ``base`` environment.
|
||||
``svnfs_mountpoint``
|
||||
********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``''``
|
||||
|
||||
@ -1405,7 +1402,7 @@ available to the Salt fileserver. Can be used in conjunction with
|
||||
|
||||
svnfs_root: somefolder/otherfolder
|
||||
|
||||
.. versionchanged:: Helium
|
||||
.. versionchanged:: 2014.7.0
|
||||
|
||||
Ability to specify svnfs roots on a per-remote basis was added. See
|
||||
:conf_master:`here <svnfs_remotes>` for more info.
|
||||
@ -1415,7 +1412,7 @@ available to the Salt fileserver. Can be used in conjunction with
|
||||
``svnfs_trunk``
|
||||
***************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``trunk``
|
||||
|
||||
@ -1432,7 +1429,7 @@ also be configured on a per-remote basis, see :conf_master:`here
|
||||
``svnfs_branches``
|
||||
******************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``branches``
|
||||
|
||||
@ -1449,7 +1446,7 @@ also be configured on a per-remote basis, see :conf_master:`here
|
||||
``svnfs_tags``
|
||||
**************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``tags``
|
||||
|
||||
@ -1466,7 +1463,7 @@ for more info.
|
||||
``svnfs_env_whitelist``
|
||||
***********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1494,7 +1491,7 @@ will be exposed as fileserver environments.
|
||||
``svnfs_env_blacklist``
|
||||
***********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1525,7 +1522,7 @@ minion: MinionFS Remote File Server Backend
|
||||
``minionfs_env``
|
||||
****************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``base``
|
||||
|
||||
@ -1540,7 +1537,7 @@ Environment from which MinionFS files are made available.
|
||||
``minionfs_mountpoint``
|
||||
***********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``''``
|
||||
|
||||
@ -1560,7 +1557,7 @@ Specifies a path on the salt fileserver from which minionfs files are served.
|
||||
``minionfs_whitelist``
|
||||
**********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
@ -1586,7 +1583,7 @@ exposed.
|
||||
``minionfs_blacklist``
|
||||
**********************
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``[]``
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ The option can can also be set to a list of masters, enabling
|
||||
- address1
|
||||
- address2
|
||||
|
||||
.. versionchanged:: Helium
|
||||
.. versionchanged:: 2014.7.0
|
||||
|
||||
The master can be dynamically configured. The :conf_minion:`master` value
|
||||
can be set to an module function which will be executed and will assume
|
||||
@ -80,7 +80,7 @@ The option can can also be set to a list of masters, enabling
|
||||
``master_type``
|
||||
---------------
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``str``
|
||||
|
||||
@ -110,7 +110,7 @@ in the list until it successfully connects.
|
||||
``master_shuffle``
|
||||
------------------
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Default: ``False``
|
||||
|
||||
@ -753,7 +753,7 @@ Enables verification of the master-public-signature returned by the master in
|
||||
auth-replies. Please see the tutorial on how to configure this properly
|
||||
`Multimaster-PKI with Failover Tutorial <http://docs.saltstack.com/en/latest/topics/tutorials/multimaster_pki.html>`_
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
@ -774,7 +774,7 @@ The filename without the *.pub-suffix of the public that should be used for
|
||||
verifying the signature from the master. The file must be located in the minions
|
||||
pki-directory.
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
@ -791,7 +791,7 @@ If :conf_minion:`verify_master_pubkey_sign` is enabled, the signature is only ve
|
||||
if the public-key of the master changes. If the signature should always be verified,
|
||||
this can be set to ``True``.
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
Mod Aggregate State Runtime Modifications
|
||||
=========================================
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
The mod_aggregate system was added in the Helium release of Salt and allows for
|
||||
The mod_aggregate system was added in the 2014.7.0 release of Salt and allows for
|
||||
runtime modification of the executing state data. Simply put, it allows for the
|
||||
data used by Salt's state system to be changed on the fly at runtime, kind of
|
||||
like a configuration management JIT compiler or a runtime import system. All in
|
||||
|
||||
@ -240,7 +240,7 @@ successfully.
|
||||
onfail
|
||||
~~~~~~
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
The ``onfail`` requisite allows for reactions to happen strictly as a response
|
||||
to the failure of another state. This can be used in a number of ways, such as
|
||||
@ -270,7 +270,7 @@ The ``onfail`` requisite is applied in the same way as ``require`` as ``watch``:
|
||||
onchanges
|
||||
~~~~~~~~~
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
The ``onchanges`` requisite makes a state only apply if the required states
|
||||
generate changes, and if the watched state's "result" is ``True``. This can be
|
||||
@ -401,11 +401,6 @@ be installed. Thus allowing for a requisite to be defined "after the fact".
|
||||
Altering States
|
||||
===============
|
||||
|
||||
.. note::
|
||||
|
||||
The ``unless``, ``onlyif``, and ``check_cmd`` options will be supported
|
||||
starting with the feature release codenamed Helium
|
||||
|
||||
The state altering system is used to make sure that states are evaluated exactly
|
||||
as the user expects. It can be used to double check that a state preformed
|
||||
exactly how it was expected to, or to make 100% sure that a state only runs
|
||||
@ -416,6 +411,8 @@ state is evaluated correctly.
|
||||
Unless
|
||||
~~~~~~
|
||||
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Use unless to only run if any of the specified commands return False.
|
||||
|
||||
.. code-block:: yaml
|
||||
@ -433,6 +430,8 @@ run.
|
||||
Onlyif
|
||||
~~~~~~
|
||||
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Onlyif is the opposite of Unless. If all of the commands in onlyif return True,
|
||||
then the state is run.
|
||||
|
||||
@ -461,6 +460,8 @@ gluster commands return back a 0 ret value.
|
||||
Check_Cmd
|
||||
~~~~~~~~~
|
||||
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
Check Command is used for determining that a state did or did not run as
|
||||
expected.
|
||||
|
||||
|
||||
@ -112,7 +112,7 @@ denotes what Salt release will be affected. For example:
|
||||
'''
|
||||
Upper-case the given value
|
||||
|
||||
.. versionadded:: Helium
|
||||
.. versionadded:: 2014.7.0
|
||||
|
||||
<...snip...>
|
||||
'''
|
||||
|
||||
Loading…
Reference in New Issue
Block a user