Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
vlajos committed Dec 4, 2014
1 parent ae17b99 commit bf5d8ee
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion docsite/rst/developing_modules.rst
Expand Up @@ -453,7 +453,7 @@ gives them slightly higher development priority (though they'll work in exactly
Deprecating and making module aliases
``````````````````````````````````````

Starting in 1.8 you can deprecate modules by renaming them with a preceeding _, i.e. old_cloud.py to
Starting in 1.8 you can deprecate modules by renaming them with a preceding _, i.e. old_cloud.py to
_old_cloud.py, This will keep the module available but hide it from the primary docs and listing.

You can also rename modules and keep an alias to the old name by using a symlink that starts with _.
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/developing_test_pr.rst
Expand Up @@ -29,7 +29,7 @@ and then commenting on that particular issue on GitHub. Here's how:
or Docker for this, but they are optional. It is also useful to have virtual machines of different Linux or
other flavors, since some features (apt vs. yum, for example) are specific to those OS versions.

First, you will need to configure your testing environment with the neccessary tools required to run our test
First, you will need to configure your testing environment with the necessary tools required to run our test
suites. You will need at least::

git
Expand Down
2 changes: 1 addition & 1 deletion docsite/rst/guide_aws.rst
Expand Up @@ -149,7 +149,7 @@ it will be automatically discoverable via a dynamic group like so::
tasks:
- ping

Using this philosophy can be a great way to keep systems seperated by the function they perform.
Using this philosophy can be a great way to keep systems separated by the function they perform.

In this example, if we wanted to define variables that are automatically applied to each machine tagged with the 'class' of 'webserver', 'group_vars'
in ansible can be used. See :doc:`splitting_out_vars`.
Expand Down
2 changes: 1 addition & 1 deletion examples/ansible.cfg
Expand Up @@ -147,7 +147,7 @@ filter_plugins = /usr/share/ansible_plugins/filter_plugins
# avoid issues.
#http_user_agent = ansible-agent

# if set to a persistant type (not 'memory', for example 'redis') fact values
# if set to a persistent type (not 'memory', for example 'redis') fact values
# from previous runs in Ansible will be stored. This may be useful when
# wanting to use, for example, IP information from one group of servers
# without having to talk to them in the same playbook run to get their
Expand Down
4 changes: 2 additions & 2 deletions hacking/test-module
Expand Up @@ -58,7 +58,7 @@ def parse():
parser.add_option('-D', '--debugger', dest='debugger',
help="path to python debugger (e.g. /usr/bin/pdb)")
parser.add_option('-I', '--interpreter', dest='interpreter',
help="path to interpeter to use for this module (e.g. ansible_python_interpreter=/usr/bin/python)",
help="path to interpreter to use for this module (e.g. ansible_python_interpreter=/usr/bin/python)",
metavar='INTERPRETER_TYPE=INTERPRETER_PATH')
parser.add_option('-c', '--check', dest='check', action='store_true',
help="run the module in check mode")
Expand Down Expand Up @@ -104,7 +104,7 @@ def boilerplate_module(modfile, args, interpreter, check):
inject = {}
if interpreter:
if '=' not in interpreter:
print 'interpeter must by in the form of ansible_python_interpreter=/usr/bin/python'
print 'interpreter must by in the form of ansible_python_interpreter=/usr/bin/python'
sys.exit(1)
interpreter_type, interpreter_path = interpreter.split('=')
if not interpreter_type.startswith('ansible_'):
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/module_utils/facts.py
Expand Up @@ -1355,7 +1355,7 @@ def get_memory_facts(self):
self.facts['memtotal_mb'] = int(data) / 1024
except AttributeError:
#For systems where memory details aren't sent to syslog or the log has rotated, use parsed
#adb output. Unfortunatley /dev/kmem doesn't have world-read, so this only works as root.
#adb output. Unfortunately /dev/kmem doesn't have world-read, so this only works as root.
if os.access("/dev/kmem", os.R_OK):
rc, out, err = module.run_command("echo 'phys_mem_pages/D' | adb -k /stand/vmunix /dev/kmem | tail -1 | awk '{print $2}'", use_unsafe_shell=True)
if not err:
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/runner/__init__.py
Expand Up @@ -982,7 +982,7 @@ def _executor_internal_inner(self, host, module_name, module_args, inject, port,
# render module_args and complex_args templates
try:
# When templating module_args, we need to be careful to ensure
# that no variables inadvertantly (or maliciously) add params
# that no variables inadvertently (or maliciously) add params
# to the list of args. We do this by counting the number of k=v
# pairs before and after templating.
num_args_pre = self._count_module_args(module_args, allow_dupes=True)
Expand Down
2 changes: 1 addition & 1 deletion test/integration/roles/test_copy/tasks/main.yml
Expand Up @@ -220,7 +220,7 @@
- name: clean up
file: dest=/tmp/worldwritable state=absent

# test overwritting a link using "follow=yes" so that the link
# test overwriting a link using "follow=yes" so that the link
# is preserved and the link target is updated

- name: create a test file to symlink to
Expand Down
4 changes: 2 additions & 2 deletions test/integration/roles/test_file/tasks/main.yml
Expand Up @@ -188,7 +188,7 @@
- "file11_result.uid == 1235"

- name: fail to create soft link to non existent file
file: src=/noneexistant dest={{output_dir}}/soft2.txt state=link force=no
file: src=/noneexistent dest={{output_dir}}/soft2.txt state=link force=no
register: file12_result
ignore_errors: true

Expand All @@ -198,7 +198,7 @@
- "file12_result.failed == true"

- name: force creation soft link to non existent
file: src=/noneexistant dest={{output_dir}}/soft2.txt state=link force=yes
file: src=/noneexistent dest={{output_dir}}/soft2.txt state=link force=yes
register: file13_result

- name: verify that link was created
Expand Down
2 changes: 1 addition & 1 deletion test/integration/roles/test_lineinfile/tasks/main.yml
Expand Up @@ -243,7 +243,7 @@
that:
- "result.stat.checksum == 'f9af7008e3cb67575ce653d094c79cabebf6e523'"

# Test EOF with empty file to make sure no unneccessary newline is added
# Test EOF with empty file to make sure no unnecessary newline is added
- name: testempty deploy the testempty file for lineinfile
copy: src=testempty.txt dest={{output_dir}}/testempty.txt
register: result
Expand Down
Expand Up @@ -41,7 +41,7 @@
- "result.changed == true"
- "result.db =='{{ db_name }}'"

- name: assert database was backup succesfully
- name: assert database was backup successfully
command: file {{ db_file_name }}
register: result

Expand Down
8 changes: 4 additions & 4 deletions test/integration/roles/test_mysql_user/tasks/main.yml
Expand Up @@ -153,22 +153,22 @@
- include: user_password_update_test.yml

# ============================================================
# Assert create user with SELECT privileges, attemp to create database and update privileges to create database
# Assert create user with SELECT privileges, attempt to create database and update privileges to create database
#
- include: test_privs.yml current_privilege=SELECT current_append_privs=no

# ============================================================
# Assert creating user with SELECT privileges, attemp to create database and append privileges to create database
# Assert creating user with SELECT privileges, attempt to create database and append privileges to create database
#
- include: test_privs.yml current_privilege=DROP current_append_privs=yes

# ============================================================
# Assert create user with SELECT privileges, attemp to create database and update privileges to create database
# Assert create user with SELECT privileges, attempt to create database and update privileges to create database
#
- include: test_privs.yml current_privilege='UPDATE,ALTER' current_append_privs=no

# ============================================================
# Assert creating user with SELECT privileges, attemp to create database and append privileges to create database
# Assert creating user with SELECT privileges, attempt to create database and append privileges to create database
#
- include: test_privs.yml current_privilege='INSERT,DELETE' current_append_privs=yes

Expand Down
2 changes: 1 addition & 1 deletion test/integration/roles/test_win_stat/tasks/main.yml
Expand Up @@ -72,7 +72,7 @@
register: win_stat_no_args
ignore_errors: true

- name: check win_stat result witn no path argument
- name: check win_stat result with no path argument
assert:
that:
- "win_stat_no_args|failed"
Expand Down
2 changes: 1 addition & 1 deletion test/units/TestModuleUtilsBasic.py
Expand Up @@ -329,5 +329,5 @@ def test_log_sanitize_correctness(self):

# The overzealous-ness here may lead to us changing the algorithm in
# the future. We could make it consume less of the data (with the
# possiblity of leaving partial passwords exposed) and encourage
# possibility of leaving partial passwords exposed) and encourage
# people to use no_log instead of relying on this obfuscation.
2 changes: 1 addition & 1 deletion test/units/TestUtils.py
Expand Up @@ -725,7 +725,7 @@ def _test_combo(input, desired):
# jinja2 loop blocks with lots of complexity
_test_combo(
# in memory of neighbors cat
# we preserve line breaks unless a line continuation character preceeds them
# we preserve line breaks unless a line continuation character precedes them
'a {% if x %} y {%else %} {{meow}} {% endif %} "cookie\nchip" \\\ndone\nand done',
['a', '{% if x %}', 'y', '{%else %}', '{{meow}}', '{% endif %}', '"cookie\nchip"', 'done\n', 'and', 'done']
)
Expand Down
2 changes: 1 addition & 1 deletion ticket_stubs/great_idea.md
@@ -1,4 +1,4 @@
Submission Recieved
Submission Received
===================

Hi!
Expand Down
2 changes: 1 addition & 1 deletion ticket_stubs/module_repo.md
Expand Up @@ -6,7 +6,7 @@ Hi!
Thanks very much for your interest in Ansible. It sincerely means a lot to us.

This appears to be a submission about a module, and aside from action_plugins, if you know what those are, the modules
in ansible are now moved two seperate repos. We would appreciate if you can submit this there instead.
in ansible are now moved two separate repos. We would appreciate if you can submit this there instead.

If this is about a new module, submit pull requests or ideas to:

Expand Down
2 changes: 1 addition & 1 deletion ticket_stubs/no_thanks.md
Expand Up @@ -14,7 +14,7 @@ open dialog. You can stop by the development list, and we'd be glad to talk abo

* https://groups.google.com/forum/#!forum/ansible-devel

In the future, sometimes starting a discussion on the development list prior to implenting a feature can make getting things included a little easier, but it's not always neccessary.
In the future, sometimes starting a discussion on the development list prior to implenting a feature can make getting things included a little easier, but it's not always necessary.

Thank you once again for this and your interest in Ansible!

2 changes: 1 addition & 1 deletion ticket_stubs/pr_duplicate.md
Expand Up @@ -15,7 +15,7 @@ However, we're absolutely always up for discussion. Since this is a really busy

* https://groups.google.com/forum/#!forum/ansible-devel

In the future, sometimes starting a discussion on the development list prior to implenting a feature can make getting things included a little easier, but it's not always neccessary.
In the future, sometimes starting a discussion on the development list prior to implenting a feature can make getting things included a little easier, but it's not always necessary.

Thank you once again for this and your interest in Ansible!

2 changes: 1 addition & 1 deletion ticket_stubs/thanks.md
@@ -1,4 +1,4 @@
Submission Recieved
Submission Received
===================

Hi!
Expand Down
2 changes: 1 addition & 1 deletion v2/ansible/compat/__init__.py
Expand Up @@ -20,7 +20,7 @@
__metaclass__ = type

'''
Compat library for ansible. This contains compatiblity definitions for older python
Compat library for ansible. This contains compatibility definitions for older python
When we need to import a module differently depending on python version, do it
here. Then in the code we can simply import from compat in order to get what we want.
'''
Expand Down
4 changes: 2 additions & 2 deletions v2/ansible/errors/__init__.py
Expand Up @@ -61,7 +61,7 @@ def __repr__(self):
def _get_error_lines_from_file(self, file_name, line_number):
'''
Returns the line in the file which coresponds to the reported error
location, as well as the line preceeding it (if the error did not
location, as well as the line preceding it (if the error did not
occur on the first line), to provide context to the error.
'''

Expand All @@ -82,7 +82,7 @@ def _get_extended_error(self):
Given an object reporting the location of the exception in a file, return
detailed information regarding it including:
* the line which caused the error as well as the one preceeding it
* the line which caused the error as well as the one preceding it
* causes and suggested remedies for common syntax errors
If this error was created with show_content=False, the reporting of content
Expand Down
4 changes: 2 additions & 2 deletions v2/ansible/parsing/yaml/__init__.py
Expand Up @@ -130,12 +130,12 @@ def _get_file_contents(self, file_name):
show_content = False
return (data, show_content)
except (IOError, OSError) as e:
raise AnsibleParserError("an error occured while trying to read the file '%s': %s" % (file_name, str(e)))
raise AnsibleParserError("an error occurred while trying to read the file '%s': %s" % (file_name, str(e)))

def _handle_error(self, yaml_exc, file_name, show_content):
'''
Optionally constructs an object (AnsibleBaseYAMLObject) to encapsulate the
file name/position where a YAML exception occured, and raises an AnsibleParserError
file name/position where a YAML exception occurred, and raises an AnsibleParserError
to display the syntax exception information.
'''

Expand Down
2 changes: 1 addition & 1 deletion v2/ansible/playbook/play.py
Expand Up @@ -170,7 +170,7 @@ def _compile_roles(self):

if len(self.roles) > 0:
for ri in self.roles:
# The internal list of roles are actualy RoleInclude objects,
# The internal list of roles are actually RoleInclude objects,
# so we load the role from that now
role = Role.load(ri)

Expand Down

0 comments on commit bf5d8ee

Please sign in to comment.