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

more typo fixes

Browse source
This commit is contained in:
Chris Rebert 2013-05-01 16:06:17 -07:00
parent ed471565f3
commit 498d2999db
40 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HACKING.rst
View file

@ -236,7 +236,7 @@ Edit the minion config file:
config file. Without the ``-c`` option, Salt finds its config files in
`/etc/salt`.
Start the master and minion, accept the minon's key, and verify your local Salt
Start the master and minion, accept the minion's key, and verify your local Salt
installation is working::
cd /path/to/your/virtualenv

2
doc/topics/hacking.rst
View file

@ -237,7 +237,7 @@ Edit the minion config file:
config file. Without the ``-c`` option, Salt finds its config files in
`/etc/salt`.
Start the master and minion, accept the minon's key, and verify your local Salt
Start the master and minion, accept the minion's key, and verify your local Salt
installation is working::
cd /path/to/your/virtualenv

2
doc/topics/installation/windows.rst
View file

@ -160,7 +160,7 @@ Install on Windows XP 32bit
cd ./salt
python setup.py install
18. Edit c:\\etc\\salt\\minon
18. Edit c:\\etc\\salt\\minion
.. code-block:: bash

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

@ -111,7 +111,7 @@ Setting up a Salt Minion
assumes that the minion will be connected to the master, for information on
how to run a master-less minion please see the masterless quickstart guide:
:doc:`Masterless Minon Quickstart </topics/tutorials/quickstart>`
:doc:`Masterless Minion Quickstart </topics/tutorials/quickstart>`
The Salt Minion only needs to be aware of one piece of information to run, the
network location of the master. By default the minion will look for the DNS

2
salt/config.py
View file

@ -389,7 +389,7 @@ def get_id():
# Can /etc/hosts help us?
try:
# TODO Add windoes host file support
# TODO Add Windows host file support
with open('/etc/hosts') as f:
line = f.readline()
while line:

2
salt/master.py
View file

@ -157,7 +157,7 @@ class Master(SMaster):
def _clear_old_jobs(self):
'''
The clean old jobs function is the geenral passive maintinance process
The clean old jobs function is the general passive maintenance process
controller for the Salt master. This is where any data that needs to
be cleanly maintained from the master is maintained.
'''

2
salt/modules/apt.py
View file

@ -406,7 +406,7 @@ def purge(pkg, **kwargs):
except Exception as e:
log.exception(e)
# Remove inital package
# Remove initial package
purge_cmd = 'apt-get -q -y purge {0}'.format(pkg)
out = __salt__['cmd.run_all'](purge_cmd)
if out['retcode'] != 0:

4
salt/modules/debian_service.py
View file

@ -176,7 +176,7 @@ def disable(name, **kwargs):
def enabled(name):
'''
Return True if the named servioce is enabled, false otherwise
Return True if the named service is enabled, false otherwise
CLI Example::
@ -187,7 +187,7 @@ def enabled(name):
def disabled(name):
'''
Return True if the named servioce is enabled, false otherwise
Return True if the named service is enabled, false otherwise
CLI Example::

4
salt/modules/freebsdservice.py
View file

@ -192,7 +192,7 @@ def disable(name, **kwargs):
def enabled(name):
'''
Return True if the named servioce is enabled, false otherwise
Return True if the named service is enabled, false otherwise
name
Service name
@ -219,7 +219,7 @@ def enabled(name):
def disabled(name):
'''
Return True if the named servioce is enabled, false otherwise
Return True if the named service is enabled, false otherwise
CLI Example::

4
salt/modules/gentoo_service.py
View file

@ -134,7 +134,7 @@ def disable(name, **kwargs):
def enabled(name):
'''
Return True if the named servioce is enabled, false otherwise
Return True if the named service is enabled, false otherwise
CLI Example::
@ -144,7 +144,7 @@ def enabled(name):
def disabled(name):
'''
Return True if the named servioce is enabled, false otherwise
Return True if the named service is enabled, false otherwise
CLI Example::

2
salt/modules/layman.py
View file

@ -43,7 +43,7 @@ def add(overlay):
__salt__['cmd.retcode'](cmd)
new_overlays = list_local()
# If we did not have any overlays before and we sucessfully added
# If we did not have any overlays before and we successfully added
# a new one. We need to ensure the make.conf is sourcing layman's
# make.conf so emerge can see the overlays
if len(old_overlays) == 0 and len(new_overlays) > 0:

2
salt/modules/nova.py
View file

@ -410,7 +410,7 @@ def _item_list():
#aggregate-details Show details of the specified aggregate.
#aggregate-list Print a list of all aggregates.
#aggregate-remove-host
# Remove the specified host from the specfied aggregate.
# Remove the specified host from the specified aggregate.
#aggregate-set-metadata
# Update the metadata associated with the aggregate.
#aggregate-update Update the aggregate's name and optionally

2
salt/modules/pacman.py
View file

@ -239,7 +239,7 @@ def install(name=None,
# Allow "version" to work for single package target
pkg_params = {name: version}
else:
log.warning('"version" parameter will be ignored for muliple '
log.warning('"version" parameter will be ignored for multiple '
'package targets')
if pkg_type == 'file':

2
salt/modules/qemu_nbd.py
View file

@ -94,7 +94,7 @@ def clear(mnt):
'''
Pass in the mnt dict returned from nbd_mount to unmount and disconnect
the image from nbd. If all of the partitions are unmounted return an
empy dict, otherwise return a dict containing the still mounted
empty dict, otherwise return a dict containing the still mounted
partitions
CLI Example::

2
salt/modules/rh_ip.py
View file

@ -388,7 +388,7 @@ def _parse_settings_bond_3(opts, iface, bond_def):
int(opts[binding])
bond.update({binding: opts[binding]})
except Exception:
_raise_error_iface(iface, binding, ['interger'])
_raise_error_iface(iface, binding, ['integer'])
else:
_log_default_iface(iface, binding, bond_def[binding])
bond.update({binding: bond_def[binding]})

2
salt/modules/s3.py
View file

@ -68,7 +68,7 @@ def get(bucket=None, path=None, return_bin=False, action=None,
local_file=None, key=None, keyid=None, service_url=None):
'''
List the contents of a bucket, or return an object from a bucket. Set
return_bin to True in order to retreive an object wholesale. Otherwise,
return_bin to True in order to retrieve an object wholesale. Otherwise,
Salt will attempt to parse an XML response.
CLI Example to list buckets::

4
salt/modules/status.py
View file

@ -74,7 +74,7 @@ def procs():
def custom():
'''
Return a custom composite of status data and info for this minon,
Return a custom composite of status data and info for this minion,
based on the minion config file. An example config like might be::
status.cpustats.custom: [ 'cpu', 'ctxt', 'btime', 'processes' ]
@ -136,7 +136,7 @@ def loadavg():
def cpustats():
'''
Return the CPU stats for this minon
Return the CPU stats for this minion
CLI Example::

2
salt/modules/sysmod.py
View file

@ -23,7 +23,7 @@ def __virtual__():
def doc(module=''):
'''
Return the docstrings for all modules. Optionally, specify a module or a
function to narrow te selection.
function to narrow the selection.
The strings are aggregated into a single document on the master for easy
reading.

2
salt/modules/tls.py
View file

@ -515,7 +515,7 @@ def create_ca_signed_cert(ca_name, CN, days=365):
CN
common name matching the certificate signing request
days
number of days certficate is valid, default is 365 (1 year)
number of days certificate is valid, default is 365 (1 year)
Writes out a Certificate (CERT) If the file already
exists, the function just returns assuming the CERT already exists.

2
salt/modules/tomcat.py
View file

@ -398,7 +398,7 @@ def deploy_war(war, context, force='no', url='http://localhost:8080/manager', en
Deploy a war file
war
absolute path to war file (should be accessable by the user running
absolute path to war file (should be accessible by the user running
tomcat) or a path supported by the salt.modules.cp.get_file function
context
the context path to deploy

2
salt/modules/yumpkg.py
View file

@ -472,7 +472,7 @@ def install(name=None,
# Allow "version" to work for single package target
pkg_params = {name: version}
else:
log.warning('"version" parameter will be ignored for muliple '
log.warning('"version" parameter will be ignored for multiple '
'package targets')
error = _set_repo_options(yumbase, **kwargs)

2
salt/modules/yumpkg5.py
View file

@ -321,7 +321,7 @@ def install(name=None,
# Allow "version" to work for single package target
pkg_params = {name: version}
else:
log.warning('"version" parameter will be ignored for muliple '
log.warning('"version" parameter will be ignored for multiple '
'package targets')
repo_arg = _get_repo_options(fromrepo=fromrepo, **kwargs)

2
salt/modules/zypper.py
View file

@ -244,7 +244,7 @@ def install(name=None,
# Allow "version" to work for single package target
pkg_params = {name: version}
else:
log.warning('"version" parameter will be ignored for muliple '
log.warning('"version" parameter will be ignored for multiple '
'package targets')
if pkg_type == 'repository':

2
salt/output/nested.py
View file

@ -15,7 +15,7 @@ class NestDisplay(object):
def display(self, ret, indent, prefix, out):
'''
Recursively interate down through data structures to determine output
Recursively iterate down through data structures to determine output
'''
if ret is None or ret is True or ret is False:
out += '{0}{1}{2}{3}{4}\n'.format(

2
salt/output/no_return.py
View file

@ -12,7 +12,7 @@ class NestDisplay(object):
def display(self, ret, indent, prefix, out):
'''
Recursively interate down through data structures to determine output
Recursively iterate down through data structures to determine output
'''
if isinstance(ret, str):
lines = ret.split('\n')

2
salt/overstate.py
View file

@ -1,5 +1,5 @@
'''
Manage the proces of the overstate. The overstate is a means to orchistrate
Manage the process of the overstate. The overstate is a means to orchestrate
the deployment of states over groups of servers.
'''

6
salt/pillar/mongo.py
View file

@ -40,8 +40,8 @@ work correctly with some experimentation.
In the example above, we've decided to use the ``vm`` collection in the
database to store the data. Minion ids are stored in the ``name`` field on
documents in that collection. And, since minon ids are FQDNs in most cases,
we'll need to trim the domain name in order to find the minon by hostname in
documents in that collection. And, since minion ids are FQDNs in most cases,
we'll need to trim the domain name in order to find the minion by hostname in
the collection. When we find a minion, return only the ``customer_id``,
``software``, and ``apache_vhosts`` fields, as that will contain the data we
want for a given node. They will be available directly inside the ``pillar``
@ -89,7 +89,7 @@ def ext_pillar(pillar, collection='pillar', id_field='_id', re_pattern=None,
* `collection`: The mongodb collection to read data from. Defaults to
``'pillar'``.
* `id_field`: The field in the collection that represents an individual
minon id. Defaults to ``'_id'``.
minion id. Defaults to ``'_id'``.
* `re_pattern`: If your naming convention in the collection is shorter
than the minion id, you can use this to trim the name.
`re_pattern` will be used to match the name, and `re_replace` will

2
salt/pillar/pillar_ldap.py
View file

@ -1,7 +1,7 @@
'''
This pillar module parses a config file (specified in the salt master config),
and executes a series of LDAP searches based on that config. Data returned by
these searches is aggregrated, with data items found later in the LDAP search
these searches is aggregated, with data items found later in the LDAP search
order overriding data found earlier on.
The final result set is merged with the pillar data.
'''

2
salt/renderers/pydsl.py
View file

@ -50,7 +50,7 @@ a few objects are defined for you, including the usual(with ``__`` added)
A state :term:`ID declaration` is created with a ``state(id)`` function call.
Subsequent ``state(id)`` call with the same id returns the same object. This
singleton access pattern applys to all declaration objects created with the DSL.
singleton access pattern applies to all declaration objects created with the DSL.
.. code-block:: python

2
salt/returners/carbon_return.py
View file

@ -78,7 +78,7 @@ def returner(ret):
val = float(val)
metrics.append((metric_base + '.' + _formatHostname(name) + '.' + key, val, timestamp))
except TypeError:
log.info('Error in carbon returner, when trying to convert metric:{0},with val:{1}'.format(key, val))
log.info('Error in carbon returner, when trying to convert metric:{0}, with val:{1}'.format(key, val))
def _send_textmetrics(metrics):
''' Use text protorocol to send metric over socket '''

6
salt/states/layman.py
View file

@ -1,5 +1,5 @@
'''
Mangement of Gentoo Overlays using layman
Management of Gentoo Overlays using layman
=========================================
A state module to manage Gentoo package overlays via layman
@ -43,7 +43,7 @@ def present(name):
if len(changes) < 1:
ret['comment'] = 'Overlay {0} failed to add'.format(name)
ret['result'] = False
# Sucess
# Success
else:
ret['changes']['added'] = changes
ret['comment'] = 'Overlay {0} added.'.format(name)
@ -77,7 +77,7 @@ def absent(name):
if len(changes) < 1:
ret['comment'] = 'Overlay {0} failed to delete'.format(name)
ret['result'] = False
# Sucess
# Success
else:
ret['changes']['deleted'] = changes
ret['comment'] = 'Overlay {0} deleted.'.format(name)

2
salt/states/tomcat.py
View file

@ -56,7 +56,7 @@ def war_deployed(name, war, url='http://localhost:8080/manager', __env__='base',
name
the context path to deploy
war
absolute path to war file (should be accessable by the user running
absolute path to war file (should be accessible by the user running
tomcat) or a path supported by the salt.modules.cp.get_file function
url : http://localhost:8080/manager
the url of the server manager webapp

2
salt/tops/mongo.py
View file

@ -77,7 +77,7 @@ def top(**kwargs):
* `collection`: The mongodb collection to read data from. Defaults to
``'tops'``.
* `id_field`: The field in the collection that represents an individual
minon id. Defaults to ``'_id'``.
minion id. Defaults to ``'_id'``.
* `re_pattern`: If your naming convention in the collection is shorter
than the minion id, you can use this to trim the name.
`re_pattern` will be used to match the name, and `re_replace` will

4
salt/utils/event.py
View file

@ -345,7 +345,7 @@ class Reactor(multiprocessing.Process, salt.state.Compiler):
Take in the tag from an event and return a list of the reactors to
process
'''
log.debug('Gathering rections for tag {0}'.format(tag))
log.debug('Gathering reactors for tag {0}'.format(tag))
reactors = []
if isinstance(self.opts['reactor'], basestring):
try:
@ -499,7 +499,7 @@ class StateFire(object):
def fire_running(self, running):
'''
Pass in a state "running" dict, this is the return dict from a state
call. The dict will be processesd and fire events.
call. The dict will be processed and fire events.
By default yellows and reds fire events on the master and minion, but
this can be configured.

2
tests/integration/modules/file.py
View file

@ -30,7 +30,7 @@ class FileModuleTest(integration.ModuleCase):
self.mybadsymlink = os.path.join(integration.TMP, 'mybadsymlink')
if os.path.islink(self.mybadsymlink):
os.remove(self.mybadsymlink)
os.symlink('/nonexistantpath', self.mybadsymlink)
os.symlink('/nonexistentpath', self.mybadsymlink)
super(FileModuleTest, self).setUp()
def tearDown(self):

4
tests/integration/states/svn.py
View file

@ -84,7 +84,7 @@ class SvnTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
def test_latest_existing_repo(self):
'''
svn.latest againt existing repository
svn.latest against existing repository
'''
current_rev = '1442865'
cwd, basename = os.path.split(self.target)
@ -110,7 +110,7 @@ class SvnTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn):
def test_latest_existing_repo_no_rev_change(self):
'''
svn.latest againt existing repository
svn.latest against existing repository
'''
current_rev = self.new_rev
cwd, basename = os.path.split(self.target)

2
tests/minionswarm.py
View file

@ -41,7 +41,7 @@ def parse():
dest='name',
default='ms',
help=('Give the minions an alternative id prefix, this is used '
'when minons from many systems are being aggregated onto '
'when minions from many systems are being aggregated onto '
'a single master'))
parser.add_option('-k',
'--keep-modules',

2
tests/unit/modules/win_status_test.py
View file

@ -183,7 +183,7 @@ class TestEmptyCommandLine(TestProcsBase):
# self.call_procs()
# self.expected_calls = [call()] * call_count
#
# def test_initialize_and_unintialize_called(self):
# def test_initialize_and_uninitialize_called(self):
# pythoncom.CoInitialize.assert_has_calls(self.expected_calls)
# pythoncom.CoUninitialize.assert_has_calls(self.expected_calls)

2
tests/unit/stateconf_test.py
View file

@ -164,7 +164,7 @@ include:
extend:
.utils::some_state:
cmd.run:
- name: echo overriden
- name: echo overridden
''', sls='test.work')
self.assertTrue('test.utils::some_state' in result['extend'])

2
tests/unit/utils/verify_test.py
View file

@ -33,7 +33,7 @@ class TestVerify(TestCase):
def test_zmq_verify(self):
self.assertTrue(zmq_version())
def test_zmq_verify_insuficient(self):
def test_zmq_verify_insufficient(self):
import zmq
zmq.__version__ = '2.1.0'
self.assertFalse(zmq_version())