mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
parent
e355c1cf90
commit
cd90052187
19 changed files with 28 additions and 28 deletions
|
@ -336,7 +336,7 @@ in the minion config file:
|
|||
pkg: aptpkg
|
||||
|
||||
The above example will force the minion to use the :py:mod:`systemd
|
||||
<salt.modules.systemd>` module to provide service mangement, and the
|
||||
<salt.modules.systemd>` module to provide service management, and the
|
||||
:py:mod:`aptpkg <salt.modules.aptpkg>` module to provide package management.
|
||||
|
||||
.. __: https://github.com/saltstack/salt/issues/new
|
||||
|
|
|
@ -344,7 +344,7 @@ External Job Cache functions using the ``ret`` execution module.
|
|||
Event Returners
|
||||
===============
|
||||
|
||||
For maximimum visibility into the history of events across a Salt
|
||||
For maximum visibility into the history of events across a Salt
|
||||
infrastructure, all events seen by a salt master may be logged to a returner.
|
||||
|
||||
To enable event logging, set the ``event_return`` configuration option in the
|
||||
|
@ -358,7 +358,7 @@ returns.
|
|||
.. note::
|
||||
On larger installations, many hundreds of events may be generated on a
|
||||
busy master every second. Be certain to closely monitor the storage of
|
||||
a given returner as Salt can easily overwhealm an underpowered server
|
||||
a given returner as Salt can easily overwhelm an underpowered server
|
||||
with thousands of returns.
|
||||
|
||||
Full List of Returners
|
||||
|
|
|
@ -82,15 +82,15 @@ and will only be fired onto the event bus.
|
|||
Synchronous vs. Asynchronous
|
||||
----------------------------
|
||||
|
||||
A runner may be fired asychronously which will immediately return control. In
|
||||
A runner may be fired asynchronously which will immediately return control. In
|
||||
this case, no output will be display to the user if ``salt-run`` is being used
|
||||
from the command-line. If used programatically, no results will be returned.
|
||||
from the command-line. If used programmatically, no results will be returned.
|
||||
If results are desired, they must be gathered either by firing events on the
|
||||
bus from the runner and then watching for them or by some other means.
|
||||
|
||||
.. note::
|
||||
|
||||
When running a runner in asyncronous mode, the ``--progress`` flag will
|
||||
When running a runner in asynchronous mode, the ``--progress`` flag will
|
||||
not deliver output to the salt-run CLI. However, progress events will
|
||||
still be fired on the bus.
|
||||
|
||||
|
|
|
@ -583,7 +583,7 @@ Load Balancer
|
|||
Compute Engine possess a load-balancer feature for splitting traffic across
|
||||
multiple instances. Please reference the
|
||||
`documentation <https://developers.google.com/compute/docs/load-balancing/>`_
|
||||
for a more complete discription.
|
||||
for a more complete description.
|
||||
|
||||
The load-balancer functionality is slightly different than that described
|
||||
in Google's documentation. The concept of *TargetPool* and *ForwardingRule*
|
||||
|
|
|
@ -437,7 +437,7 @@ data from the state that will make use of the data.
|
|||
Light conditionals and looping
|
||||
``````````````````````````````
|
||||
|
||||
Jinja is extremely powerful for programatically generating Salt states. It is
|
||||
Jinja is extremely powerful for programmatically generating Salt states. It is
|
||||
also easy to overuse. As a rule of thumb, if it is hard to read it will be hard
|
||||
to maintain!
|
||||
|
||||
|
@ -461,7 +461,7 @@ Below is a simple example of a readable loop:
|
|||
|
||||
Avoid putting a Jinja conditionals within Salt states where possible.
|
||||
Readability suffers and the correct YAML indentation is difficult to see in the
|
||||
surrounding visual noise. Parameterization (discussed below) and variables are
|
||||
surrounding visual noise. Parametrization (discussed below) and variables are
|
||||
both useful techniques to avoid this. For example:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
@ -500,7 +500,7 @@ both useful techniques to avoid this. For example:
|
|||
- name: {{ name }}
|
||||
|
||||
Dictionaries are useful to effectively "namespace" a collection of variables.
|
||||
This is useful with parameterization (discussed below). Dictionaries are also
|
||||
This is useful with parametrization (discussed below). Dictionaries are also
|
||||
easily combined and merged. And they can be directly serialized into YAML which
|
||||
is often easier than trying to create valid YAML through templating. For
|
||||
example:
|
||||
|
|
|
@ -180,7 +180,7 @@ request``.
|
|||
|
||||
.. note::
|
||||
|
||||
Although these instructions seem to be the official pull request proceedure
|
||||
Although these instructions seem to be the official pull request procedure
|
||||
on github's website, here are two alternative methods that are simpler.
|
||||
|
||||
* If you navigate to your clone of salt,
|
||||
|
|
|
@ -289,7 +289,7 @@ Changes:
|
|||
|
||||
- **PR** `#33474`_: (*cachedout*) Fix diskusage beacon
|
||||
|
||||
- **PR** `#33465`_: (*meaksh*) jobs.exit_success allow to check if a job has executed and exit successfully
|
||||
- **PR** `#33465`_: (*meaksh*) jobs.exit_success allow one to check if a job has executed and exit successfully
|
||||
|
||||
- **PR** `#33487`_: (*jtand*) Add docstring examples to glance.py and nova.py [2015.8]
|
||||
|
||||
|
@ -333,7 +333,7 @@ Changes:
|
|||
|
||||
* c9d0de4 Documentation update in file.serialize. (`#33421`_)
|
||||
|
||||
* f8a90eb Fix LVM parameter devices as a pure list. Comma seperated lists are c⦠(`#33398`_)
|
||||
* f8a90eb Fix LVM parameter devices as a pure list. Comma separated lists are c⦠(`#33398`_)
|
||||
|
||||
* 3989e5b Spelling correction. (`#33406`_)
|
||||
|
||||
|
|
|
@ -678,7 +678,7 @@ Changes:
|
|||
|
||||
- **PR** `#33961`_: (*jacobhammons*) 2016.3.0 known issues update
|
||||
|
||||
- **PR** `#33908`_: (*ticosax*) [boto_lambda] handle ommitted Permissions parameter
|
||||
- **PR** `#33908`_: (*ticosax*) [boto_lambda] handle omitted Permissions parameter
|
||||
|
||||
- **PR** `#33896`_: (*DmitryKuzmenko*) Don't deep copy context dict values.
|
||||
|
||||
|
|
|
@ -364,7 +364,7 @@ In the example configuration above, the following is true:
|
|||
2. The first remote will serve all files in the repository. The second
|
||||
remote will only serve files from the ``salt`` directory (and its
|
||||
subdirectories). The third remote will only server files from the
|
||||
``other/salt`` directory (and its subdirectorys), while the fourth remote
|
||||
``other/salt`` directory (and its subdirectories), while the fourth remote
|
||||
will only serve files from the ``salt/states`` directory (and its
|
||||
subdirectories).
|
||||
|
||||
|
|
|
@ -910,7 +910,7 @@ def config_get(key,
|
|||
Now optional if ``global`` is set to ``True``
|
||||
|
||||
global : False
|
||||
If ``True``, query the global git configuraton. Otherwise, only the
|
||||
If ``True``, query the global git configuration. Otherwise, only the
|
||||
local git configuration will be queried.
|
||||
|
||||
.. versionadded:: 2015.8.0
|
||||
|
@ -998,7 +998,7 @@ def config_get_regexp(key,
|
|||
The path to the git checkout
|
||||
|
||||
global : False
|
||||
If ``True``, query the global git configuraton. Otherwise, only the
|
||||
If ``True``, query the global git configuration. Otherwise, only the
|
||||
local git configuration will be queried.
|
||||
|
||||
user
|
||||
|
|
|
@ -824,7 +824,7 @@ def refresh_db(**kwargs):
|
|||
Do not refresh the specified repo
|
||||
|
||||
enablerepo
|
||||
Refesh a disabled repo using this option
|
||||
Refresh a disabled repo using this option
|
||||
|
||||
branch
|
||||
Add the specified branch when refreshing
|
||||
|
|
|
@ -42,7 +42,7 @@ To override individual configuration items, append --return_kwargs '{"key:": "va
|
|||
On concurrent database access
|
||||
==============================
|
||||
|
||||
As this returner creates a couchdb document whith the salt job id as document id
|
||||
As this returner creates a couchdb document with the salt job id as document id
|
||||
and as only one document with a given id can exist in a given couchdb database,
|
||||
it is advised for most setups that every minion be configured to write to it own
|
||||
database (the value of ``couchdb.db`` may be suffixed with the minion id),
|
||||
|
|
|
@ -306,7 +306,7 @@ def _compare_acl(current, desired, region, key, keyid, profile):
|
|||
|
||||
def _compare_policy(current, desired, region, key, keyid, profile):
|
||||
'''
|
||||
Policy discription is always returned as a JSON string. Comparison
|
||||
Policy description is always returned as a JSON string. Comparison
|
||||
should be object-to-object, since order is not significant in JSON
|
||||
'''
|
||||
if isinstance(desired, string_types):
|
||||
|
|
|
@ -136,7 +136,7 @@ def present(
|
|||
The ID of the VPC to create the security group in, if any. Exclusive with vpc_name.
|
||||
|
||||
vpc_name
|
||||
The name of the VPC to create the security group in, if any. Exlusive with vpc_id.
|
||||
The name of the VPC to create the security group in, if any. Exclusive with vpc_id.
|
||||
|
||||
.. versionadded:: 2016.3.0
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ def __virtual__():
|
|||
|
||||
def _parse_pkg_string(pkg):
|
||||
'''
|
||||
Parse pkg string and return a tuple of packge name, separator, and
|
||||
Parse pkg string and return a tuple of package name, separator, and
|
||||
package version.
|
||||
|
||||
Cabal support install package with following format:
|
||||
|
|
|
@ -13,7 +13,7 @@ filesystem is within the specified limits.
|
|||
disk.status:
|
||||
- name: /dev/xda1
|
||||
- maximum: 79%
|
||||
- minumum: 11%
|
||||
- minimum: 11%
|
||||
|
||||
It can be used with an ``onfail`` requisite, for example, to take additional
|
||||
action in response to or in preparation for other states.
|
||||
|
|
|
@ -723,7 +723,7 @@ def installed(
|
|||
package version will be installed à la ``pkg.latest``.
|
||||
|
||||
:param bool refresh:
|
||||
This parameter controls whether or not the packge repo database is
|
||||
This parameter controls whether or not the package repo database is
|
||||
updated prior to installing the requested package(s).
|
||||
|
||||
If ``True``, the package database will be refreshed (``apt-get
|
||||
|
@ -1541,7 +1541,7 @@ def latest(
|
|||
Skip the GPG verification check for the package to be installed
|
||||
|
||||
refresh
|
||||
This parameter controls whether or not the packge repo database is
|
||||
This parameter controls whether or not the package repo database is
|
||||
updated prior to checking for the latest available version of the
|
||||
requested packages.
|
||||
|
||||
|
|
|
@ -219,7 +219,7 @@ def private_key_managed(name,
|
|||
whenever a new certificiate is generated.
|
||||
|
||||
backup:
|
||||
When replacing an existing file, backup the old file onthe minion.
|
||||
When replacing an existing file, backup the old file on the minion.
|
||||
Default is False.
|
||||
|
||||
Example:
|
||||
|
@ -516,7 +516,7 @@ def crl_managed(name,
|
|||
Include expired certificates in the CRL. Default is ``False``.
|
||||
|
||||
backup:
|
||||
When replacing an existing file, backup the old file onthe minion. Default is False.
|
||||
When replacing an existing file, backup the old file on the minion. Default is False.
|
||||
|
||||
Example:
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
VT Helper
|
||||
|
||||
This module provides the SSHConnection to expose an SSH connection object
|
||||
allowing users to programatically execute commands on a remote server using
|
||||
allowing users to programmatically execute commands on a remote server using
|
||||
Salt VT.
|
||||
'''
|
||||
from __future__ import absolute_import
|
||||
|
|
Loading…
Add table
Reference in a new issue