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

Fix various spelling mistakes

Browse Source 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
This commit is contained in:
Benjamin Drung 2018-03-08 19:11:13 +01:00
parent a43d999fb8
commit 3d37eca847
44 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1404,7 +1404,7 @@ This should still be considered a less than secure option, due to the fact
that trust is based on just the requesting minion.
Please see the :ref:`Autoaccept Minions from Grains <tutorial-autoaccept-grains>`
documentation for more infomation.
documentation for more information.
.. code-block:: yaml
@ -2178,7 +2178,7 @@ This allows the following more convenient syntax to be used:
# (this comment remains in the rendered template)
## ensure all the formula services are running
% for service in formula_services:
enable_service_{{ serivce }}:
enable_service_{{ service }}:
service.running:
name: {{ service }}
% endfor

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

@ -2463,7 +2463,7 @@ The grains that should be sent to the master on authentication to decide if
the minion's key should be accepted automatically.
Please see the :ref:`Autoaccept Minions from Grains <tutorial-autoaccept-grains>`
documentation for more infomation.
documentation for more information.
.. code-block:: yaml

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

@ -71,7 +71,7 @@ The generated grain information will appear similar to:
provider: my_ec2:ec2
profile: ec2-web
The generation of the salt-cloud grain can be surpressed by the
The generation of the salt-cloud grain can be suppressed by the
option ``enable_cloud_grains: 'False'`` in the cloud configuration file.
Cloud Configuration Syntax

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

@ -125,7 +125,7 @@ to start that machine running.
The "magic packet" must be sent by an existing salt minion which is on
the same network segment as the target machine. (Or your router
must be set up especially to route WoL packets.) Your target machine
must be set up to listen for WoL and to respond appropriatly.
must be set up to listen for WoL and to respond appropriately.
You must provide the Salt node id of the machine which will send
the WoL packet \(parameter ``wol_sender_node``\), and

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

@ -153,7 +153,7 @@ starts at the root of the state tree or pillar.
Errors
======
Saltstack allows to raise custom errors using the ``raise`` jinja function.
Saltstack allows raising custom errors using the ``raise`` jinja function.
.. code-block:: jinja
@ -1122,7 +1122,7 @@ Returns:
'body': '{
"userId": 1,
"id": 1,
"title": "sunt aut facere repellat provident occaecati excepturi optio reprehenderit",
"title": "sunt aut facere repellat provident occaecati excepturi option reprehenderit",
"body": "quia et suscipit\\nsuscipit recusandae consequuntur expedita et cum\\nreprehenderit molestiae ut ut quas totam\\nnostrum rerum est autem sunt rem eveniet architecto"
}'
}

4
doc/topics/orchestrate/orchestrate_runner.rst
View File

@ -338,8 +338,8 @@ Given the above setup, the orchestration will be carried out as follows:
.. _orchestrate-runner-parsing-results-programatically:
Parsing Results Programatically
-------------------------------
Parsing Results Programmatically
--------------------------------
Orchestration jobs return output in a specific data structure. That data
structure is represented differently depending on the outputter used. With the

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

@ -146,7 +146,7 @@ Changes:
- **PR** `#36690`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3
- **PR** `#36680`_: (*rallytime*) [2016.3] Merge forward from 2015.8 to 2016.3
- **PR** `#36659`_: (*terminalmage*) Support dynamic env in new-style git_pillar
- **PR** `#36538`_: (*clinta*) daemon-reload on call to service.avaliable
- **PR** `#36538`_: (*clinta*) daemon-reload on call to service.available
- **PR** `#36616`_: (*cro*) Zypper fix test
- **PR** `#36621`_: (*terminalmage*) Fix shadowed builtins
- **PR** `#36636`_: (*rallytime*) Back-port `#36618`_ to 2016.3

8
doc/topics/releases/2018.3.0.rst
View File

@ -503,7 +503,7 @@ setting a ``port`` option under the Master's ``discovery`` configuration:
.. note::
When using a port number other than the default, the Minion's ``discovery``
configuraton must *also* have a port specified, otherwise the Minion will
configuration must *also* have a port specified, otherwise the Minion will
still attempt to contact the Master on port ``4520``.
**Minion configuration**
@ -528,7 +528,7 @@ Connection to a type instead of DNS
By now each Minion was connecting to a Master by DNS or IP address. From now on it is possible
also to connect to a _type_ of a Master. For example, in a network there are three different
Masters, each corresponds for a particular niche or environment or specific role etc. The Minion
is supposed to connect only to one of those Masters that is described approriately.
is supposed to connect only to one of those Masters that is described appropriately.
To achieve such an effect, each `/etc/salt/master` configuration should have a `discovery` option,
which should have a `mapping` element with arbitrary key/value pairs. The same configuration should
@ -701,7 +701,7 @@ The generated grain information will appear similar to:
provider: my_ec2:ec2
profile: ec2-web
The generation of salt-cloud grains can be surpressed by the
The generation of salt-cloud grains can be suppressed by the
option ``enable_cloud_grains: 'False'`` in the cloud configuration file.
Upgraded Saltify Driver
@ -766,7 +766,7 @@ Terms usable in yaml files Description
========================== ===========
classes A list of classes that will be processed in order
states A list of states that will be returned by master_tops function
pillars A yaml dictionnary that will be returned by the ext_pillar function
pillars A yaml dictionary that will be returned by the ext_pillar function
environment Node saltenv that will be used by master_tops
========================== ===========

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

@ -10,7 +10,7 @@ Slots
future releases
Many times it is useful to store the results of a command during the course of
an execution. Salt Slots are designed to allow to store this information and
an execution. Salt Slots are designed to allow you to store this information and
use it later during the :ref:`highstate <running-highstate>` or other job
execution.

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

@ -327,14 +327,14 @@ Here's a summary of the command line options:
-U If set, fully upgrade the system prior to bootstrapping Salt
-I If set, allow insecure connections while downloading any files. For
example, pass '--no-check-certificate' to 'wget' or '--insecure' to
'curl'. On Debian and Ubuntu, using this option with -U allows to obtain
'curl'. On Debian and Ubuntu, using this option with -U allows one to obtain
GnuPG archive keys insecurely if distro has changed release signatures.
-F Allow copied files to overwrite existing (config, init.d, etc)
-K If set, keep the temporary files in the temporary directories specified
with -c and -k
-C Only run the configuration function. Implies -F (forced overwrite).
To overwrite Master or Syndic configs, -M or -S, respectively, must
also be specified. Salt installation will be ommitted, but some of the
also be specified. Salt installation will be omitted, but some of the
dependencies could be installed to write configuration with -j or -J.
-A Pass the salt-master DNS name or IP. This will be stored under
${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf

2
pkg/suse/salt.changes
View File

@ -70,7 +70,7 @@ Mon Oct 12 08:48:25 UTC 2015 - dmacvicar@suse.de
-------------------------------------------------------------------
Mon Oct 12 08:19:45 UTC 2015 - dmacvicar@suse.de
- allow to disable docs in preparation for building
- allow one to disable docs in preparation for building
on other platforms without all dependencies.
-------------------------------------------------------------------

2
salt/cloud/clouds/proxmox.py
View File

@ -648,7 +648,7 @@ def _get_properties(path="", method="GET", forced_params=None):
# Browse all path elements but last
for elem in path_levels[:-1]:
search_path += '/' + elem
# Lookup for a dictionnary with path = "requested path" in list" and return its children
# Lookup for a dictionary with path = "requested path" in list" and return its children
sub = (item for item in sub if item["path"] == search_path).next()['children']
# Get leaf element in path
search_path += '/' + path_levels[-1]

2
salt/cloud/deploy/bootstrap-salt.sh
View File

@ -345,7 +345,7 @@ __usage() {
with -c and -k
-C Only run the configuration function. Implies -F (forced overwrite).
To overwrite Master or Syndic configs, -M or -S, respectively, must
also be specified. Salt installation will be ommitted, but some of the
also be specified. Salt installation will be omitted, but some of the
dependencies could be installed to write configuration with -j or -J.
-A Pass the salt-master DNS name or IP. This will be stored under
\${BS_SALT_ETC_DIR}/minion.d/99-master-address.conf

4
salt/config/__init__.py
View File

@ -252,7 +252,7 @@ VALID_OPTS = {
# Force the minion into a single environment when it fetches files from the master
'saltenv': (type(None), six.string_types),
# Prevent saltenv from being overriden on the command line
# Prevent saltenv from being overridden on the command line
'lock_saltenv': bool,
# Force the minion into a single pillar root when it fetches pillar data from the master
@ -2310,7 +2310,7 @@ def prepend_root_dir(opts, path_options):
# drive is not prefixed on a config option
pass
elif os.path.isabs(path):
# Absolute path (not default or overriden root_dir)
# Absolute path (not default or overridden root_dir)
# No prepending required
continue
# Prepending the root dir

2
salt/engines/ircbot.py
View File

@ -46,7 +46,7 @@ Example of usage
08:33:57 gtmanbot > gtmanfred: pong
08:34:02 @gtmanfred > !echo ping
08:34:02 gtmanbot > ping
08:34:17 @gtmanfred > !event test/tag/ircbot irc is usefull
08:34:17 @gtmanfred > !event test/tag/ircbot irc is useful
08:34:17 gtmanbot > gtmanfred: TaDa!
.. code-block:: text

6
salt/engines/slack.py
View File

@ -267,7 +267,7 @@ class SlackClient(object):
def can_user_run(self, user, command, groups):
'''
Break out the permissions into the folowing:
Break out the permissions into the following:
Check whether a user is in any group, including whether a group has the '*' membership
@ -282,7 +282,7 @@ class SlackClient(object):
:rtype: tuple
:returns: On a successful permitting match, returns 2-element tuple that contains
the name of the group that successfuly matched, and a dictionary containing
the name of the group that successfully matched, and a dictionary containing
the configuration of the group so it can be referenced.
On failure it returns an empty tuple
@ -400,7 +400,7 @@ class SlackClient(object):
When encountering an error (e.g. invalid message), yields {}, the caller can proceed to the next message
When the websocket being read from has given up all its messages, yields {'done': True} to
indicate that the caller has read all of the relevent data for now, and should continue
indicate that the caller has read all of the relevant data for now, and should continue
its own processing and check back for more data later.
This relies on the caller sleeping between checks, otherwise this could flood

2
salt/modules/aptpkg.py
View File

@ -1084,7 +1084,7 @@ def upgrade(refresh=True, dist_upgrade=False, **kwargs):
<value> seconds
download_only
Only donwload the packages, don't unpack or install them
Only download the packages, don't unpack or install them
.. versionadded:: 2018.3.0

14
salt/modules/cmdmod.py
View File

@ -3226,10 +3226,10 @@ def powershell_all(cmd,
empty Powershell output (which would result in an exception). Instead we
treat this as a special case and one of two things will happen:
- If the value of the ``force_list`` paramater is ``True``, then the
- If the value of the ``force_list`` parameter is ``True``, then the
``result`` field of the return dictionary will be an empty list.
- If the value of the ``force_list`` paramater is ``False``, then the
- If the value of the ``force_list`` parameter is ``False``, then the
return dictionary **will not have a result key added to it**. We aren't
setting ``result`` to ``None`` in this case, because ``None`` is the
Python representation of "null" in JSON. (We likewise can't use ``False``
@ -3242,20 +3242,20 @@ def powershell_all(cmd,
content, and the type of the resulting Python object is other than ``list``
then one of two things will happen:
- If the value of the ``force_list`` paramater is ``True``, then the
- If the value of the ``force_list`` parameter is ``True``, then the
``result`` field will be a singleton list with the Python object as its
sole member.
- If the value of the ``force_list`` paramater is ``False``, then the value
- If the value of the ``force_list`` parameter is ``False``, then the value
of ``result`` will be the unmodified Python object.
If Powershell's output is not an empty string, Python is able to parse its
content, and the type of the resulting Python object is ``list``, then the
value of ``result`` will be the unmodified Python object. The
``force_list`` paramater has no effect in this case.
``force_list`` parameter has no effect in this case.
.. note::
An example of why the ``force_list`` paramater is useful is as
An example of why the ``force_list`` parameter is useful is as
follows: The Powershell command ``dir x | Convert-ToJson`` results in
- no output when x is an empty directory.
@ -3403,7 +3403,7 @@ def powershell_all(cmd,
where characters may be dropped or incorrectly converted when executed.
Default is False.
:param bool force_list: The purpose of this paramater is described in the
:param bool force_list: The purpose of this parameter is described in the
preamble of this function's documentation. Default value is False.
:return: A dictionary with the following entries:

2
salt/modules/highstate_doc.py
View File

@ -178,7 +178,7 @@ If you wish to customize the document format:
- mode: '0640'
Some `replace_text_regex` values that might be helpfull.
Some `replace_text_regex` values that might be helpful.
## CERTS
'-----BEGIN RSA PRIVATE KEY-----[\r\n\t\f\S]{0,2200}': 'XXXXXXX'

6
salt/modules/infoblox.py
View File

@ -367,7 +367,7 @@ def get_host_mac(name=None, allow_array=False, **api_opts):
'''
Get mac address from host record.
Use `allow_array` to return possible mutiple values.
Use `allow_array` to return possible multiple values.
CLI Example:
@ -390,7 +390,7 @@ def get_host_ipv4(name=None, mac=None, allow_array=False, **api_opts):
'''
Get ipv4 address from host record.
Use `allow_array` to return possible mutiple values.
Use `allow_array` to return possible multiple values.
CLI Example:
@ -446,7 +446,7 @@ def get_host_ipv6addr_info(ipv6addr=None, mac=None,
def get_network(ipv4addr=None, network=None, return_fields=None, **api_opts):
'''
Get list of all networks.
This is helpfull when looking up subnets to
This is helpful when looking up subnets to
use with func:nextavailableip
This call is offen slow and not cached!

2
salt/modules/kernelpkg_linux_apt.py
View File

@ -189,7 +189,7 @@ def upgrade(reboot=False, at_time=None):
def upgrade_available():
'''
Detect if a new kernel version is available in the repositories.
Returns True if a new kernel is avaliable, False otherwise.
Returns True if a new kernel is available, False otherwise.
CLI Example:

2
salt/modules/kernelpkg_linux_yum.py
View File

@ -182,7 +182,7 @@ def upgrade(reboot=False, at_time=None):
def upgrade_available():
'''
Detect if a new kernel version is available in the repositories.
Returns True if a new kernel is avaliable, False otherwise.
Returns True if a new kernel is available, False otherwise.
CLI Example:

2
salt/modules/libcloud_compute.py
View File

@ -206,7 +206,7 @@ def destroy_node(node_id, profile, **libcloud_kwargs):
'''
Destroy a node in the cloud
:param node_id: Unique ID of the node to destory
:param node_id: Unique ID of the node to destroy
:type node_id: ``str``
:param profile: The profile key

2
salt/modules/logadm.py
View File

@ -256,7 +256,7 @@ def rotate(name, pattern=None, conf_file=default_conf, **kwargs):
``name`` and ``pattern`` were kept for backwards compatibility reasons.
``name`` is an alias for the ``entryname`` argument, ``pattern`` is an alias
for ``log_file``. These aliasses wil only be used if the ``entryname`` and
for ``log_file``. These aliases will only be used if the ``entryname`` and
``log_file`` arguments are not passed.
For a full list of arguments see ```logadm.show_args```.

2
salt/modules/reg.py
View File

@ -728,7 +728,7 @@ def import_file(source, use_32bit_registry=False):
can be either a local file path or a URL type supported by salt
(e.g. ``salt://salt_master_path``).
:param bool use_32bit_registry: If the value of this paramater is ``True``
:param bool use_32bit_registry: If the value of this parameter is ``True``
then the ``REG`` file will be imported into the Windows 32 bit registry.
Otherwise the Windows 64 bit registry will be used.

4
salt/modules/state.py
View File

@ -230,7 +230,7 @@ def soft_kill(jid, state_id=None):
this instructs a running state to safely exit at a given
state id. This needs to pass in the jid of the running state.
If a state_id is not passed then the jid referenced will be safely exited
at the begining of the next state run.
at the beginning of the next state run.
The given state id is the id got a given state execution, so given a state
that looks like this:
@ -263,7 +263,7 @@ def pause(jid, state_id=None, duration=None):
Set up a state id pause, this instructs a running state to pause at a given
state id. This needs to pass in the jid of the running state and can
optionally pass in a duration in seconds. If a state_id is not passed then
the jid referenced will be paused at the begining of the next state run.
the jid referenced will be paused at the beginning of the next state run.
The given state id is the id got a given state execution, so given a state
that looks like this:

16
salt/modules/vsphere.py
View File

@ -3944,7 +3944,7 @@ def create_dvs(dvs_dict, dvs_name, service_instance=None):
Note: The ``dvs_name`` param will override any name set in ``dvs_dict``.
dvs_dict
Dict representation of the new DVS (exmaple in salt.states.dvs)
Dict representation of the new DVS (example in salt.states.dvs)
dvs_name
Name of the DVS to be created.
@ -4019,7 +4019,7 @@ def update_dvs(dvs_dict, dvs, service_instance=None):
dvs_dict
Dictionary with the values the DVS should be update with
(exmaple in salt.states.dvs)
(example in salt.states.dvs)
dvs
Name of the DVS to be updated.
@ -4479,7 +4479,7 @@ def create_dvportgroup(portgroup_dict, portgroup_name, dvs,
portgroup_dict
Dictionary with the config values the portgroup should be created with
(exmaple in salt.states.dvs).
(example in salt.states.dvs).
portgroup_name
Name of the portgroup to be created.
@ -4526,7 +4526,7 @@ def update_dvportgroup(portgroup_dict, portgroup, dvs, service_instance=True):
portgroup_dict
Dictionary with the values the portgroup should be update with
(exmaple in salt.states.dvs).
(example in salt.states.dvs).
portgroup
Name of the portgroup to be updated.
@ -4813,7 +4813,7 @@ def create_storage_policy(policy_name, policy_dict, service_instance=None):
policy_dict
Dictionary containing the changes to apply to the policy.
(exmaple in salt.states.pbm)
(example in salt.states.pbm)
service_instance
Service instance (vim.ServiceInstance) of the vCenter.
@ -4853,7 +4853,7 @@ def update_storage_policy(policy, policy_dict, service_instance=None):
policy_dict
Dictionary containing the changes to apply to the policy.
(exmaple in salt.states.pbm)
(example in salt.states.pbm)
service_instance
Service instance (vim.ServiceInstance) of the vCenter.
@ -6472,7 +6472,7 @@ def configure_host_cache(enabled, datastore=None, swap_size_MiB=None,
swap_size_MiB
Swap size in Mibibytes. Needs to be set if enabled is ``true``. Must be
smaller thant the datastore size.
smaller than the datastore size.
service_instance
Service instance (vim.ServiceInstance) of the vCenter/ESXi host.
@ -7595,7 +7595,7 @@ def _apply_hard_disk(unit_number, key, operation, disk_label=None, size=None,
Action which should be done on the device add or edit
disk_label
Label of the new disk, can be overriden
Label of the new disk, can be overridden
size
Size of the disk

2
salt/modules/win_file.py
View File

@ -1605,7 +1605,7 @@ def check_perms(path,
``True``.
reset (bool):
``True`` wil show what permisisons will be removed by resetting the
``True`` will show what permisisons will be removed by resetting the
DACL. ``False`` will do nothing. Default is ``False``.
Returns:

2
salt/modules/zypper.py
View File

@ -1058,7 +1058,7 @@ def install(name=None,
This parameter is ignored if ``pkgs`` or ``sources`` is passed.
resolve_capabilities
If this option is set to True zypper will take capabilites into
If this option is set to True zypper will take capabilities into
account. In this case names which are just provided by a package
will get installed. Default is False.

2
salt/pillar/http_json.py
View File

@ -29,7 +29,7 @@ in <> brackets) in the url in order to populate pillar data based on the grain v
.. versionchanged:: 2018.3.0
If %s is present in the url, it will be automaticaly replaced by the minion_id:
If %s is present in the url, it will be automatically replaced by the minion_id:
.. code-block:: yaml

2
salt/pillar/http_yaml.py
View File

@ -29,7 +29,7 @@ in <> brackets) in the url in order to populate pillar data based on the grain v
.. versionchanged:: 2018.3.0
If %s is present in the url, it will be automaticaly replaced by the minion_id:
If %s is present in the url, it will be automatically replaced by the minion_id:
.. code-block:: yaml

4
salt/states/esxi.py
View File

@ -1061,7 +1061,7 @@ def diskgroups_configured(name, diskgroups, erase_disks=False):
erase_disks
Specifies whether to erase all partitions on all disks member of the
disk group before the disk group is created. Default vaule is False.
disk group before the disk group is created. Default value is False.
'''
proxy_details = __salt__['esxi.get_details']()
hostname = proxy_details['host'] if not proxy_details.get('vcenter') \
@ -1371,7 +1371,7 @@ def host_cache_configured(name, enabled, datastore, swap_size='100%',
erase_backing_disk
Specifies whether to erase all partitions on the backing disk before
the datastore is created. Default vaule is False.
the datastore is created. Default value is False.
'''
log.trace('enabled = %s', enabled)
log.trace('datastore = %s', datastore)

2
salt/states/etcd_mod.py
View File

@ -41,7 +41,7 @@ or clusters are available.
as this makes all master configuration settings available in all minion's
pillars.
Etcd profile configuration can be overriden using following arguments: ``host``,
Etcd profile configuration can be overridden using following arguments: ``host``,
``port``, ``username``, ``password``, ``ca``, ``client_key`` and ``client_cert``.
.. code-block:: yaml

2
salt/states/infoblox_host_record.py
View File

@ -104,7 +104,7 @@ def present(name=None, data=None, ensure_data=True, **api_opts):
addr['ipv4addr'] = ip
found_matches += 1
if found_matches > 1:
ret['comment'] = 'infoblox record cant updated because ipaddress {0} matches mutiple func:nextavailableip'.format(ip)
ret['comment'] = 'infoblox record cant updated because ipaddress {0} matches multiple func:nextavailableip'.format(ip)
ret['result'] = False
return ret

2
salt/states/kernelpkg.py
View File

@ -31,7 +31,7 @@ Example state chaining the install and reboot operations:
- onchanges:
- kernel: install-latest-kernel
Chaining can also be acheived using wait/listen requisites:
Chaining can also be achieved using wait/listen requisites:
.. code-block:: yaml

8
salt/states/pkg.py
View File

@ -1133,7 +1133,7 @@ def installed(
.. versionadded:: 2014.1.1
:param bool resolve_capabilities:
Turn on resolving capabilities. This allow to name "provides" or alias names for packages.
Turn on resolving capabilities. This allow one to name "provides" or alias names for packages.
.. versionadded:: 2018.3.0
@ -1967,7 +1967,7 @@ def downloaded(name,
- salt-minion: 2015.8.5-1.el6
:param bool resolve_capabilities:
Turn on resolving capabilities. This allow to name "provides" or alias names for packages.
Turn on resolving capabilities. This allow one to name "provides" or alias names for packages.
.. versionadded:: 2018.3.0
@ -2259,7 +2259,7 @@ def latest(
has no effect on the rest.
:param bool resolve_capabilities:
Turn on resolving capabilities. This allow to name "provides" or alias names for packages.
Turn on resolving capabilities. This allow one to name "provides" or alias names for packages.
.. versionadded:: 2018.3.0
@ -2886,7 +2886,7 @@ def uptodate(name, refresh=False, pkgs=None, **kwargs):
have no effect on the rest.
:param bool resolve_capabilities:
Turn on resolving capabilities. This allow to name "provides" or alias names for packages.
Turn on resolving capabilities. This allow one to name "provides" or alias names for packages.
.. versionadded:: 2018.3.0

2
salt/states/rabbitmq_policy.py
View File

@ -54,7 +54,7 @@ def present(name,
priority
Priority (defaults to 0)
apply_to
Apply policy to 'queues', 'exchanges' or 'all' (defailt to 'all')
Apply policy to 'queues', 'exchanges' or 'all' (default to 'all')
vhost
Virtual host to apply to (defaults to '/')
runas

2
salt/states/vagrant.py
View File

@ -319,7 +319,7 @@ def powered_off(name):
def destroyed(name):
'''
Stops a VM (or VMs) and removes all refences to it (them). (Runs ``vagrant destroy``.)
Stops a VM (or VMs) and removes all references to it (them). (Runs ``vagrant destroy``.)
Subsequent re-use of the same machine will requere another operation of ``vagrant.running``
or a call to the ``vagrant.init`` execution module.

2
salt/thorium/check.py
View File

@ -373,7 +373,7 @@ def len_gte(name, value):
def len_lt(name, value):
'''
Only succeed if the lenght of the given register location is less than
Only succeed if the length of the given register location is less than
the given value.
USAGE:

2
salt/utils/gitfs.py
View File

@ -492,7 +492,7 @@ class GitProvider(object):
@classmethod
def add_conf_overlay(cls, name):
'''
Programatically determine config value based on the desired saltenv
Programmatically determine config value based on the desired saltenv
'''
def _getconf(self, tgt_env='base'):
strip_sep = lambda x: x.rstrip(os.sep) \

2
salt/utils/napalm.py
View File

@ -259,7 +259,7 @@ def get_device_opts(opts, salt_obj=None):
if opts.get('proxy') or opts.get('napalm'):
opts['multiprocessing'] = device_dict.get('multiprocessing', False)
# Most NAPALM drivers are SSH-based, so multiprocessing should default to False.
# But the user can be allows to have a different value for the multiprocessing, which will
# But the user can be allows one to have a different value for the multiprocessing, which will
# override the opts.
if salt_obj and not device_dict:
# get the connection details from the opts

2
tests/integration/files/saltclass/examples/classes/roles/app.yml
View File

@ -17,5 +17,5 @@ pillars:
- app-backend
# Safe minion_id matching
{% if minion_id == 'zrh.node3' %}
safe_pillar: '_only_ zrh.node3 will see this pillar and this cannot be overriden like grains'
safe_pillar: '_only_ zrh.node3 will see this pillar and this cannot be overridden like grains'
{% endif %}

2
tests/unit/states/test_docker_image.py
View File

@ -84,7 +84,7 @@ class DockerImageTestCase(TestCase, LoaderModuleMockMixin):
- force: true
if ``image:latest`` is not downloaded and force is true
should pull a new image successfuly.
should pull a new image successfully.
'''
docker_inspect_image = MagicMock(return_value={'Id': '1234567890ab'})
docker_pull = MagicMock(

2
tests/unit/utils/test_state.py
View File

@ -482,7 +482,7 @@ class UtilStateMergeSubreturnTestcase(TestCase):
res = salt.utils.state.merge_subreturn(m, s)
self.assertFalse(res['result'])
# False result cannot be overriden
# False result cannot be overridden
for any_result in [True, None, False]:
m = copy.deepcopy(self.main_ret)
m['result'] = False