From b89cb956092e6f28d16010dc887ee2dc46e7855b Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 12 Jun 2017 12:25:19 +0530 Subject: [PATCH] Fix spelling mistakes (comments only) (#25564) Original Author : klemens Taking over previous PR as per https://github.com/ansible/ansible/pull/23644#issuecomment-307334525 Signed-off-by: Abhijeet Kasurde --- CHANGELOG.md | 6 +++--- contrib/inventory/apstra_aos.py | 2 +- contrib/inventory/ec2.py | 6 +++--- contrib/inventory/nagios_livestatus.ini | 2 +- docs/bin/generate_man.py | 2 +- .../rst/dev_guide/developing_modules_in_groups.rst | 3 ++- docs/docsite/rst/intro_networking.rst | 4 ++-- docs/docsite/rst/intro_windows.rst | 4 ++-- docs/docsite/rst/modules_support.rst | 2 +- docs/docsite/rst/playbooks_lookups.rst | 2 +- examples/hosts.yaml | 2 +- examples/scripts/ConfigureRemotingForAnsible.ps1 | 2 +- hacking/metadata-tool.py | 2 +- lib/ansible/cli/vault.py | 6 +++--- lib/ansible/executor/play_iterator.py | 2 +- lib/ansible/module_utils/ovirt.py | 2 +- lib/ansible/module_utils/service.py | 4 ++-- lib/ansible/module_utils/urls.py | 2 +- lib/ansible/modules/cloud/amazon/ec2_group.py | 2 +- .../modules/cloud/amazon/ec2_vpc_route_table.py | 2 +- lib/ansible/modules/cloud/amazon/s3.py | 2 +- lib/ansible/modules/cloud/amazon/sns.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_instance.py | 8 ++++---- .../cloud/cloudstack/cs_loadbalancer_rule_member.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_pod.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_vpc.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_zone.py | 2 +- lib/ansible/modules/cloud/google/gcdns_record.py | 4 ++-- lib/ansible/modules/cloud/google/gce.py | 2 +- lib/ansible/modules/cloud/linode/linode.py | 2 +- lib/ansible/modules/cloud/openstack/os_auth.py | 2 +- lib/ansible/modules/cloud/openstack/os_flavor_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_floating_ip.py | 2 +- lib/ansible/modules/cloud/openstack/os_group.py | 2 +- lib/ansible/modules/cloud/openstack/os_image.py | 2 +- lib/ansible/modules/cloud/openstack/os_image_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_ironic.py | 2 +- .../modules/cloud/openstack/os_ironic_inspect.py | 2 +- lib/ansible/modules/cloud/openstack/os_ironic_node.py | 2 +- lib/ansible/modules/cloud/openstack/os_keypair.py | 2 +- .../modules/cloud/openstack/os_keystone_domain.py | 2 +- .../cloud/openstack/os_keystone_domain_facts.py | 2 +- .../modules/cloud/openstack/os_keystone_role.py | 2 +- .../modules/cloud/openstack/os_keystone_service.py | 2 +- lib/ansible/modules/cloud/openstack/os_network.py | 2 +- .../modules/cloud/openstack/os_networks_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_nova_flavor.py | 2 +- lib/ansible/modules/cloud/openstack/os_object.py | 2 +- lib/ansible/modules/cloud/openstack/os_port.py | 2 +- lib/ansible/modules/cloud/openstack/os_port_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_project.py | 2 +- .../modules/cloud/openstack/os_project_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_quota.py | 2 +- lib/ansible/modules/cloud/openstack/os_recordset.py | 2 +- lib/ansible/modules/cloud/openstack/os_router.py | 2 +- .../modules/cloud/openstack/os_security_group.py | 2 +- .../modules/cloud/openstack/os_security_group_rule.py | 2 +- .../modules/cloud/openstack/os_server_actions.py | 2 +- lib/ansible/modules/cloud/openstack/os_server_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_server_group.py | 2 +- .../modules/cloud/openstack/os_server_volume.py | 2 +- lib/ansible/modules/cloud/openstack/os_stack.py | 2 +- lib/ansible/modules/cloud/openstack/os_subnet.py | 2 +- .../modules/cloud/openstack/os_subnets_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_user.py | 2 +- lib/ansible/modules/cloud/openstack/os_user_facts.py | 2 +- lib/ansible/modules/cloud/openstack/os_user_group.py | 2 +- lib/ansible/modules/cloud/openstack/os_user_role.py | 2 +- lib/ansible/modules/cloud/openstack/os_volume.py | 2 +- lib/ansible/modules/cloud/openstack/os_zone.py | 2 +- lib/ansible/modules/cloud/ovirt/ovirt_clusters.py | 2 +- lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py | 2 +- .../modules/cloud/ovirt/ovirt_storage_domains.py | 2 +- lib/ansible/modules/cloud/smartos/vmadm.py | 2 +- lib/ansible/modules/cloud/vmware/vca_nat.py | 2 +- lib/ansible/modules/crypto/openssl_csr.py | 6 +++--- lib/ansible/modules/crypto/openssl_privatekey.py | 2 +- lib/ansible/modules/crypto/openssl_publickey.py | 4 ++-- lib/ansible/modules/database/misc/kibana_plugin.py | 2 +- .../modules/database/postgresql/postgresql_privs.py | 2 +- lib/ansible/modules/files/blockinfile.py | 4 ++-- lib/ansible/modules/files/stat.py | 2 +- lib/ansible/modules/identity/ipa/ipa_host.py | 2 +- lib/ansible/modules/identity/ipa/ipa_sudorule.py | 2 +- lib/ansible/modules/monitoring/monit.py | 2 +- lib/ansible/modules/monitoring/sensu_check.py | 4 ++-- lib/ansible/modules/net_tools/basics/uri.py | 2 +- .../modules/net_tools/exoscale/exo_dns_domain.py | 2 +- lib/ansible/modules/net_tools/omapi_host.py | 2 +- lib/ansible/modules/network/cumulus/_cl_bond.py | 2 +- lib/ansible/modules/network/cumulus/_cl_bridge.py | 2 +- lib/ansible/modules/network/cumulus/_cl_interface.py | 2 +- .../modules/network/f5/bigip_ssl_certificate.py | 2 +- .../modules/network/fortios/fortios_ipv4_policy.py | 4 ++-- lib/ansible/modules/network/lenovo/cnos_interface.py | 4 ++-- lib/ansible/modules/network/lenovo/cnos_portchannel.py | 4 ++-- .../modules/network/ordnance/ordnance_config.py | 2 +- .../modules/network/panos/panos_cert_gen_ssh.py | 4 ++-- lib/ansible/modules/notification/hall.py | 2 +- lib/ansible/modules/notification/mattermost.py | 4 ++-- lib/ansible/modules/notification/rocketchat.py | 2 +- lib/ansible/modules/packaging/os/apk.py | 2 +- .../modules/packaging/os/redhat_subscription.py | 2 +- lib/ansible/modules/packaging/os/swupd.py | 2 +- .../modules/remote_management/stacki/stacki_host.py | 2 +- lib/ansible/modules/source_control/git.py | 2 +- .../modules/storage/infinidat/infini_export_client.py | 2 +- lib/ansible/modules/storage/netapp/netapp_e_host.py | 6 +++--- .../modules/storage/netapp/sf_volume_manager.py | 2 +- lib/ansible/modules/system/aix_inittab.py | 2 +- lib/ansible/modules/system/cronvar.py | 2 +- lib/ansible/modules/system/crypttab.py | 2 +- lib/ansible/modules/system/gconftool2.py | 2 +- lib/ansible/modules/system/iptables.py | 2 +- lib/ansible/modules/system/user.py | 2 +- lib/ansible/modules/utilities/logic/wait_for.py | 2 +- .../web_infrastructure/ansible_tower/tower_job_wait.py | 2 +- lib/ansible/modules/windows/win_acl_inheritance.ps1 | 2 +- lib/ansible/parsing/mod_args.py | 2 +- lib/ansible/parsing/yaml/objects.py | 2 +- lib/ansible/playbook/base.py | 2 +- lib/ansible/playbook/helpers.py | 2 +- lib/ansible/plugins/callback/__init__.py | 8 ++++---- lib/ansible/plugins/filter/core.py | 2 +- lib/ansible/plugins/lookup/mongodb.py | 2 +- lib/ansible/utils/module_docs_fragments/fortios.py | 2 +- lib/ansible/utils/module_docs_fragments/tower.py | 2 +- lib/ansible/utils/vars.py | 2 +- .../roles/cnos_backup/cnos_backup_sample_hosts | 2 +- test/integration/roles/cnos_bgp/cnos_bgp_sample_hosts | 2 +- .../roles/cnos_command/cnos_command_sample_hosts | 2 +- .../cnos_conditional_command_sample_hosts | 2 +- .../cnos_conditional_template_sample_hosts | 2 +- .../roles/cnos_ethernet/cnos_ethernet_sample_hosts | 2 +- .../roles/cnos_facts/cnos_facts_sample_hosts | 2 +- .../roles/cnos_image/cnos_image_sample_hosts | 2 +- .../cnos_portchannel/cnos_portchannel_sample_hosts | 2 +- .../roles/cnos_rollback/cnos_rollback_sample_hosts | 2 +- .../integration/roles/cnos_save/cnos_save_sample_hosts | 2 +- .../roles/cnos_showrun/cnos_showrun_sample_hosts | 2 +- .../roles/cnos_template/cnos_template_sample_hosts | 2 +- .../integration/roles/cnos_vlag/cnos_vlag_sample_hosts | 2 +- .../integration/roles/cnos_vlan/cnos_vlan_sample_hosts | 2 +- .../roles/test_consul_service/tasks/main.yml | 4 ++-- test/integration/roles/test_gce_tag/tasks/test.yml | 6 +++--- test/integration/roles/test_jenkins_job/tasks/main.yml | 8 ++++---- .../targets/parsing/cnos_vlan/cnos_vlan_sample_hosts | 2 +- .../targets/win_async_wrapper/tasks/main.yml | 2 +- test/integration/targets/win_find/tasks/main.yml | 2 +- test/integration/targets/win_reg_stat/tasks/main.yml | 8 ++++---- test/integration/targets/win_service/tasks/main.yml | 4 ++-- .../units/cli/test_data/role_skeleton/meta/main.yml.j2 | 2 +- test/units/module_utils/gcp/test_auth.py | 2 +- test/units/parsing/vault/test_vault_editor.py | 2 +- test/units/parsing/yaml/test_loader.py | 2 +- test/units/playbook/role/test_include_role.py | 4 ++-- test/units/plugins/action/test_synchronize.py | 10 +++++----- test/units/vars/test_variable_manager.py | 2 +- 158 files changed, 202 insertions(+), 201 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b50ca0a1d6..73bbbba7b51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1195,7 +1195,7 @@ Module fixes: running rsync. In 1.9.x and previous, sudo was run on the host that rsync connected to. 2.0.1 restores the 1.9.x behaviour. * Additionally, several other problems with where synchronize chose to run when - combined with delegate_to were fixed. In particular, if a playbook targetted + combined with delegate_to were fixed. In particular, if a playbook targeted localhost and then delegated_to a remote host the prior behavior (in 1.9.x and 2.0.0.x) was to copy files between the src and destination directories on the delegated host. This has now been fixed to copy between localhost and @@ -2728,7 +2728,7 @@ the variable is still registered for the host, with the attribute skipped: True. * added basename and dirname as Jinja2 filters available to all templates * pip works better when sudoing from unprivileged users * fix for user creation with groups specification reporting 'changed' incorrectly in some cases -* fix for some unicode encoding errors in outputing some data in verbose mode +* fix for some unicode encoding errors in outputting some data in verbose mode * improved FreeBSD, NetBSD and Solaris facts * debug module always outputs data without having to specify -v * fix for sysctl module creating new keys (must specify checks=none) @@ -3102,7 +3102,7 @@ New Modules: * new LSB facts (release, distro, etc) * pause module -- (pause seconds=10) (pause minutes=1) (pause prompt=foo) -- it's an action plugin * a module for adding entries to the main crontab (though you may still wish to just drop template files into cron.d) -* debug module can be used for outputing messages without using 'shell echo' +* debug module can be used for outputting messages without using 'shell echo' * a fail module is now available for causing errors, you might want to use it with only_if to fail in certain conditions Other module Changes, Upgrades, and Fixes: diff --git a/contrib/inventory/apstra_aos.py b/contrib/inventory/apstra_aos.py index 9d2b12c798a..52445a33723 100755 --- a/contrib/inventory/apstra_aos.py +++ b/contrib/inventory/apstra_aos.py @@ -27,7 +27,7 @@ of hosts, groups the hosts are in, and even variables to assign to each host. To use this: - copy this file over /etc/ansible/hosts and chmod +x the file. - - Copy both files (.py and .ini) in your prefered directory + - Copy both files (.py and .ini) in your preferred directory More information about Ansible Dynamic Inventory here http://unix.stackexchange.com/questions/205479/in-ansible-dynamic-inventory-json-can-i-render-hostvars-based-on-the-hostname diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py index 0f4bf2a8fda..589cef49195 100755 --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -12,7 +12,7 @@ variables needed for Boto have already been set: export AWS_ACCESS_KEY_ID='AK123' export AWS_SECRET_ACCESS_KEY='abc123' -optional region environement variable if region is 'auto' +optional region environment variable if region is 'auto' This script also assumes there is an ec2.ini file alongside it. To specify a different path to ec2.ini, define the EC2_INI_PATH environment variable: @@ -723,7 +723,7 @@ class Ec2Inventory(object): ''' Makes an AWS API call to the list of ElastiCache clusters (with nodes' info) in a particular region.''' - # ElastiCache boto module doesn't provide a get_all_intances method, + # ElastiCache boto module doesn't provide a get_all_instances method, # that's why we need to call describe directly (it would be called by # the shorthand method anyway...) try: @@ -759,7 +759,7 @@ class Ec2Inventory(object): ''' Makes an AWS API call to the list of ElastiCache replication groups in a particular region.''' - # ElastiCache boto module doesn't provide a get_all_intances method, + # ElastiCache boto module doesn't provide a get_all_instances method, # that's why we need to call describe directly (it would be called by # the shorthand method anyway...) try: diff --git a/contrib/inventory/nagios_livestatus.ini b/contrib/inventory/nagios_livestatus.ini index 3ff7408cd74..320f11f35c1 100644 --- a/contrib/inventory/nagios_livestatus.ini +++ b/contrib/inventory/nagios_livestatus.ini @@ -19,7 +19,7 @@ # default field group for host: groups # Uncomment to override: # group_field=state -# default fields retrieved: address, alias, display_name, childs, parents +# default fields retrieved: address, alias, display_name, children, parents # To override, uncomment the following line # fields_to_retrieve=address,alias,display_name # diff --git a/docs/bin/generate_man.py b/docs/bin/generate_man.py index f3615f63a08..52092c570b5 100755 --- a/docs/bin/generate_man.py +++ b/docs/bin/generate_man.py @@ -94,7 +94,7 @@ if __name__ == '__main__': myclass = "%sCLI" % libname.capitalize() output[libname] = 'ansible-%s.1.asciidoc.in' % libname - # instanciate each cli and ask its options + # instantiate each cli and ask its options mycli = getattr(__import__("ansible.cli.%s" % libname, fromlist=[myclass]), myclass) cli_object = mycli([]) try: diff --git a/docs/docsite/rst/dev_guide/developing_modules_in_groups.rst b/docs/docsite/rst/dev_guide/developing_modules_in_groups.rst index 647791c00e9..99db820da53 100644 --- a/docs/docsite/rst/dev_guide/developing_modules_in_groups.rst +++ b/docs/docsite/rst/dev_guide/developing_modules_in_groups.rst @@ -29,6 +29,7 @@ Although it's tempting to get straight into coding, there are a few things to be * Although not required, unit and/or integration tests are strongly recommended. Unit tests are especially valuable when external resources (such as cloud or network devices) are required. For more information see :doc:`testing` and the `Testing Working Group `_. * Starting with Ansible 2.4 all :doc:`../list_of_network_modules` MUST have unit tests. + Naming Convention ````````````````` @@ -142,7 +143,7 @@ We realise this may be your first use of Git or GitHub. The following guides may * `How to sync (update) your fork `_ * `How to create a Pull Request (PR) `_ -Please note that in the Ansible Git Repo the main branch is called ``devel`` rather than ``master``, which is used in the offical GitHub documentation +Please note that in the Ansible Git Repo the main branch is called ``devel`` rather than ``master``, which is used in the official GitHub documentation After your first PR has been merged ensure you "sync your fork" with ``ansible/ansible`` to ensure you've pulled in the directory structure and and shared code or documentation previously created. diff --git a/docs/docsite/rst/intro_networking.rst b/docs/docsite/rst/intro_networking.rst index a3cd408109e..36da23d5451 100644 --- a/docs/docsite/rst/intro_networking.rst +++ b/docs/docsite/rst/intro_networking.rst @@ -169,9 +169,9 @@ Ansible allows you to use conditionals to control the flow of your playbooks. An * contains - Object contains specified item -Conditional statements evalute the results from the commands that are +Conditional statements evaluate the results from the commands that are executed remotely on the device. Once the task executes the command -set, the waitfor argument can be used to evalute the results before +set, the waitfor argument can be used to evaluate the results before returning control to the Ansible playbook. For example:: diff --git a/docs/docsite/rst/intro_windows.rst b/docs/docsite/rst/intro_windows.rst index abd173d55e0..438f548c390 100644 --- a/docs/docsite/rst/intro_windows.rst +++ b/docs/docsite/rst/intro_windows.rst @@ -55,7 +55,7 @@ At the prompt you can quickly start using the Ansible devel branch by running th git clone https://github.com/ansible/ansible.git source ansible/hacking/env-setup -After you've successfully run these commands, you can start to create your inventory, write example playbooks and start targetting systems using the plethora of available Windows modules. +After you've successfully run these commands, you can start to create your inventory, write example playbooks and start targeting systems using the plethora of available Windows modules. .. Note:: Ansible is also reported to work on Cygwin, but this is more cumbersome and doesn't scale as well as WSL. @@ -469,7 +469,7 @@ You may wind up with a more readable playbook by using the PowerShell equivalent - name: Move file on remote Windows Server from one location to another win_command: Powershell.exe "Move-Item C:\teststuff\myfile.conf C:\builds\smtp.conf" -Bear in mind that using ``win_command`` or ``win_shell`` will always report ``changed``, and it is your responsiblity to ensure PowerShell will need to handle idempotency as appropriate (the move examples above are inherently not idempotent), so where possible use (or write) a module. +Bear in mind that using ``win_command`` or ``win_shell`` will always report ``changed``, and it is your responsibility to ensure PowerShell will need to handle idempotency as appropriate (the move examples above are inherently not idempotent), so where possible use (or write) a module. Here's an example of how to use the ``win_stat`` module to test for file existence. Note that the data returned by the ``win_stat`` module is slightly different than what is provided by the Linux equivalent:: diff --git a/docs/docsite/rst/modules_support.rst b/docs/docsite/rst/modules_support.rst index ff172bdc9a4..315952289d7 100644 --- a/docs/docsite/rst/modules_support.rst +++ b/docs/docsite/rst/modules_support.rst @@ -3,7 +3,7 @@ Module Support .. toctree:: :maxdepth: 1 -Ansible has many modules, but not all of them are maintained by the core project commiters. Each module should have associated metadata that indicates which of the following categories they fall into. This should be visible in each module's documentation. +Ansible has many modules, but not all of them are maintained by the core project committers. Each module should have associated metadata that indicates which of the following categories they fall into. This should be visible in each module's documentation. Documentation updates for each module can also be edited directly in the module and by submitting a pull request to the module source code; just look for the "DOCUMENTATION" block in the source tree. diff --git a/docs/docsite/rst/playbooks_lookups.rst b/docs/docsite/rst/playbooks_lookups.rst index 90c45a0d963..6a350465473 100644 --- a/docs/docsite/rst/playbooks_lookups.rst +++ b/docs/docsite/rst/playbooks_lookups.rst @@ -473,7 +473,7 @@ Since there are too many parameters for this lookup method, below is a sample pl #optional query parameters #we accept any parameter from the normal mongodb query. - # the offical documentation is here + # the official documentation is here # https://api.mongodb.org/python/current/api/pymongo/collection.html?highlight=find#pymongo.collection.Collection.find # filter: { "hostname": "batman" } projection: { "pid": True , "_id" : False , "hostname" : True } diff --git a/examples/hosts.yaml b/examples/hosts.yaml index 3510746d646..952dd01406b 100644 --- a/examples/hosts.yaml +++ b/examples/hosts.yaml @@ -45,7 +45,7 @@ ## beta.example.org: # Ex 4: all vars -# keeping withing 'all' group you can define common 'all' vars here with lowest precedence +# keeping within 'all' group you can define common 'all' vars here with lowest precedence ## vars: ## commontoall: thisvar diff --git a/examples/scripts/ConfigureRemotingForAnsible.ps1 b/examples/scripts/ConfigureRemotingForAnsible.ps1 index 502fb2388c1..b84dc295a49 100644 --- a/examples/scripts/ConfigureRemotingForAnsible.ps1 +++ b/examples/scripts/ConfigureRemotingForAnsible.ps1 @@ -16,7 +16,7 @@ # a 10-year valid certificate. # # Use option -ForceNewSSLCert if the system has been SysPreped and a new -# SSL Certifcate must be forced on the WinRM Listener when re-running this +# SSL Certificate must be forced on the WinRM Listener when re-running this # script. This is necessary when a new SID and CN name is created. # # Use option -SkipNetworkProfileCheck to skip the network profile check. diff --git a/hacking/metadata-tool.py b/hacking/metadata-tool.py index 893dad50214..7afa1517711 100755 --- a/hacking/metadata-tool.py +++ b/hacking/metadata-tool.py @@ -398,7 +398,7 @@ def write_metadata(filename, new_metadata, version=None, overwrite=False): raise ParseError('Could not add metadata to {}'.format(filename)) if current_metadata is None: - # No curent metadata so we can just add it + # No current metadata so we can just add it start_line = find_documentation(module_data) if start_line < 0: if os.path.basename(filename) in NONMODULE_PY_FILES: diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py index bda1fcc9e73..737d0313944 100644 --- a/lib/ansible/cli/vault.py +++ b/lib/ansible/cli/vault.py @@ -148,7 +148,7 @@ class VaultCLI(CLI): self.b_new_vault_pass = CLI.read_vault_password_file(self.options.new_vault_password_file, loader) if not self.b_vault_pass or self.options.ask_vault_pass: - # the 'read' options dont need to ask for password confirmation. + # the 'read' options don't need to ask for password confirmation. # 'edit' is read/write, but the decrypt will confirm. if self.action in ['decrypt', 'edit', 'view', 'rekey']: self.b_vault_pass = self.ask_vault_passwords() @@ -213,7 +213,7 @@ class VaultCLI(CLI): b_plaintext_list = [] # remove the non-option '-' arg (used to indicate 'read from stdin') from the candidate args so - # we dont add it to the plaintext list + # we don't add it to the plaintext list args = [x for x in self.args if x != '-'] # We can prompt and read input, or read from stdin, but not both. @@ -298,7 +298,7 @@ class VaultCLI(CLI): # TODO: offer block or string ala eyaml def _format_output_vault_strings(self, b_plaintext_list): - # If we are only showing one item in the output, we dont need to included commented + # If we are only showing one item in the output, we don't need to included commented # delimiters in the text show_delimiter = False if len(b_plaintext_list) > 1: diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 5fe3a07aa36..a25e61368f1 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -331,7 +331,7 @@ class PlayIterator: # First, we check for a child task state that is not failed, and if we # have one recurse into it for the next task. If we're done with the child - # state, we clear it and drop back to geting the next task from the list. + # state, we clear it and drop back to getting the next task from the list. if state.tasks_child_state: (state.tasks_child_state, task) = self._get_next_task_from_state(state.tasks_child_state, host=host, peek=peek, in_child=True) if self._check_failed_state(state.tasks_child_state): diff --git a/lib/ansible/module_utils/ovirt.py b/lib/ansible/module_utils/ovirt.py index 571adb595c4..588150b53af 100644 --- a/lib/ansible/module_utils/ovirt.py +++ b/lib/ansible/module_utils/ovirt.py @@ -550,7 +550,7 @@ class BaseModule(object): ) self.post_update(entity) - # Update diffs only if user specified --diff paramter, + # Update diffs only if user specified --diff parameter, # so we don't useless overload API: if self._module._diff: before = get_dict_of_struct( diff --git a/lib/ansible/module_utils/service.py b/lib/ansible/module_utils/service.py index 54f07d29d67..4a27fde3147 100644 --- a/lib/ansible/module_utils/service.py +++ b/lib/ansible/module_utils/service.py @@ -67,7 +67,7 @@ def get_sysv_script(name): def sysv_exists(name): ''' This function will return True or False depending on - the existance of an init script corresponding to the service name supplied. + the existence of an init script corresponding to the service name supplied. :arg name: name of the service to test for ''' @@ -93,7 +93,7 @@ def fail_if_missing(module, found, service, msg=''): def daemonize(module, cmd): ''' - Execute a command while detaching as a deamon, returns rc, stdout, and stderr. + Execute a command while detaching as a daemon, returns rc, stdout, and stderr. :arg module: is an AnsbileModule object, used for it's utility methods :arg cmd: is a list or string representing the command and options to run diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index 74cb1a1b8c8..9de91d244e5 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -468,7 +468,7 @@ def generic_urlparse(parts): # so remove it and convert the port to an integer port = int(port[1:]) if auth: - # the capture group above inclues the @, so remove it + # the capture group above includes the @, so remove it # and then split it up based on the first ':' found auth = auth[:-1] username, password = auth.split(':', 1) diff --git a/lib/ansible/modules/cloud/amazon/ec2_group.py b/lib/ansible/modules/cloud/amazon/ec2_group.py index 0340ffeb12e..c11d194f9e1 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_group.py +++ b/lib/ansible/modules/cloud/amazon/ec2_group.py @@ -45,7 +45,7 @@ options: description: - List of firewall inbound rules to enforce in this group (see example). If none are supplied, no inbound rules will be enabled. Rules list may include its own name in `group_name`. - This allows idempotent loopback additions (e.g. allow group to acccess itself). + This allows idempotent loopback additions (e.g. allow group to access itself). Rule sources list support was added in version 2.4. This allows to define multiple sources per source type as well as multiple source types per rule. Prior to 2.4 an individual source is allowed. required: false diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py index 3055dfa3181..4649d104453 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py +++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py @@ -30,7 +30,7 @@ options: lookup: description: - "Look up route table by either tags or by route table ID. Non-unique tag lookup will fail. - If no tags are specifed then no lookup for an existing route table is performed and a new + If no tags are specified then no lookup for an existing route table is performed and a new route table will be created. To change tags of a route table or delete a route table, you must look up by id." required: false diff --git a/lib/ansible/modules/cloud/amazon/s3.py b/lib/ansible/modules/cloud/amazon/s3.py index 8f2eaa42268..42be44740bb 100644 --- a/lib/ansible/modules/cloud/amazon/s3.py +++ b/lib/ansible/modules/cloud/amazon/s3.py @@ -253,7 +253,7 @@ EXAMPLES = ''' bucket: mybucket mode: delete -- name: GET an object but dont download if the file checksums match. New in 2.0 +- name: GET an object but don't download if the file checksums match. New in 2.0 s3: bucket: mybucket object: /my/desired/key.txt diff --git a/lib/ansible/modules/cloud/amazon/sns.py b/lib/ansible/modules/cloud/amazon/sns.py index d9090211172..ab43511db17 100644 --- a/lib/ansible/modules/cloud/amazon/sns.py +++ b/lib/ansible/modules/cloud/amazon/sns.py @@ -207,7 +207,7 @@ def main(): "the 'json' message_structure.") # .publish() takes full ARN topic id, but I'm lazy and type shortnames - # so do a lookup (topics cannot contain ':', so thats the decider) + # so do a lookup (topics cannot contain ':', so that's the decider) if ':' in topic: arn_topic = topic else: diff --git a/lib/ansible/modules/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/cloud/cloudstack/cs_instance.py index 1638ab223af..ea92fbcfd65 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_instance.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_instance.py @@ -872,7 +872,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): def stop_instance(self): instance = self.get_instance() - # in check mode intance may not be instanciated + # in check mode instance may not be instanciated if instance: if instance['state'].lower() in ['stopping', 'stopped']: return instance @@ -893,7 +893,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): def start_instance(self): instance = self.get_instance() - # in check mode intance may not be instanciated + # in check mode instance may not be instanciated if instance: if instance['state'].lower() in ['starting', 'running']: return instance @@ -914,7 +914,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): def restart_instance(self): instance = self.get_instance() - # in check mode intance may not be instanciated + # in check mode instance may not be instanciated if instance: if instance['state'].lower() in [ 'running', 'starting' ]: self.result['changed'] = True @@ -936,7 +936,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): def restore_instance(self): instance = self.get_instance() self.result['changed'] = True - # in check mode intance may not be instanciated + # in check mode instance may not be instanciated if instance: args = {} args['templateid'] = self.get_template_or_iso(key='id') diff --git a/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule_member.py b/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule_member.py index 6531bf44c56..cea0c3b3243 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule_member.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule_member.py @@ -82,7 +82,7 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' -# Add VMs to an exising load balancer +# Add VMs to an existing load balancer - local_action: module: cs_loadbalancer_rule_member name: balance_http diff --git a/lib/ansible/modules/cloud/cloudstack/cs_pod.py b/lib/ansible/modules/cloud/cloudstack/cs_pod.py index 29c36913f3d..a408baf9f40 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_pod.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_pod.py @@ -38,7 +38,7 @@ options: required: true id: description: - - uuid of the exising pod. + - uuid of the existing pod. default: null required: false start_ip: diff --git a/lib/ansible/modules/cloud/cloudstack/cs_vpc.py b/lib/ansible/modules/cloud/cloudstack/cs_vpc.py index cfda450bac9..fe361b2ef51 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_vpc.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_vpc.py @@ -161,7 +161,7 @@ region_level_vpc: type: boolean sample: true restart_required: - description: "Wheter the VPC router needs a restart or not." + description: "Whether the VPC router needs a restart or not." returned: success type: boolean sample: true diff --git a/lib/ansible/modules/cloud/cloudstack/cs_zone.py b/lib/ansible/modules/cloud/cloudstack/cs_zone.py index 4a01544262b..f5731ff3d86 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_zone.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_zone.py @@ -38,7 +38,7 @@ options: required: true id: description: - - uuid of the exising zone. + - uuid of the existing zone. default: null required: false state: diff --git a/lib/ansible/modules/cloud/google/gcdns_record.py b/lib/ansible/modules/cloud/google/gcdns_record.py index ca4f7617a3a..d0c2d980a21 100644 --- a/lib/ansible/modules/cloud/google/gcdns_record.py +++ b/lib/ansible/modules/cloud/google/gcdns_record.py @@ -56,7 +56,7 @@ options: - The DNS domain name of the zone (e.g., example.com). - One of either I(zone) or I(zone_id) must be specified as an option, or the module will fail. - - If both I(zone) and I(zone_id) are specifed, I(zone_id) will be + - If both I(zone) and I(zone_id) are specified, I(zone_id) will be used. required: false zone_id: @@ -68,7 +68,7 @@ options: with dashes. A zone ID will never have any dots in it. - I(zone_id) can be faster than I(zone) in projects with a large number of zones. - - If both I(zone) and I(zone_id) are specifed, I(zone_id) will be + - If both I(zone) and I(zone_id) are specified, I(zone_id) will be used. required: false type: diff --git a/lib/ansible/modules/cloud/google/gce.py b/lib/ansible/modules/cloud/google/gce.py index 5e60dccabd0..33fc331c96f 100644 --- a/lib/ansible/modules/cloud/google/gce.py +++ b/lib/ansible/modules/cloud/google/gce.py @@ -193,7 +193,7 @@ author: "Eric Johnson (@erjohnso) , Tom Melendez (@supertom EXAMPLES = ''' # Basic provisioning example. Create a single Debian 8 instance in the # us-central1-a Zone of the n1-standard-1 machine type. -# Create multiple instances by specifying multiple names, seperated by +# Create multiple instances by specifying multiple names, separated by # commas in the instance_names field # (e.g. my-test-instance1,my-test-instance2) gce: diff --git a/lib/ansible/modules/cloud/linode/linode.py b/lib/ansible/modules/cloud/linode/linode.py index 887b4cb873c..7002a4b73d7 100644 --- a/lib/ansible/modules/cloud/linode/linode.py +++ b/lib/ansible/modules/cloud/linode/linode.py @@ -81,7 +81,7 @@ options: version_added: "2.3" alert_bwquota_enabled: description: - - Set status of bandwidth quota alerts as percentage of network tranfer quota. + - Set status of bandwidth quota alerts as percentage of network transfer quota. default: "True" choices: [ "True", "False" ] version_added: "2.3" diff --git a/lib/ansible/modules/cloud/openstack/os_auth.py b/lib/ansible/modules/cloud/openstack/os_auth.py index 6eefad4042b..89dab02bc24 100644 --- a/lib/ansible/modules/cloud/openstack/os_auth.py +++ b/lib/ansible/modules/cloud/openstack/os_auth.py @@ -34,7 +34,7 @@ requirements: options: availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_flavor_facts.py b/lib/ansible/modules/cloud/openstack/os_flavor_facts.py index 249f4018eee..8c242338002 100644 --- a/lib/ansible/modules/cloud/openstack/os_flavor_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_flavor_facts.py @@ -83,7 +83,7 @@ options: version_added: "2.3" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_floating_ip.py b/lib/ansible/modules/cloud/openstack/os_floating_ip.py index 7d6ed77d74f..b70bac8772a 100644 --- a/lib/ansible/modules/cloud/openstack/os_floating_ip.py +++ b/lib/ansible/modules/cloud/openstack/os_floating_ip.py @@ -91,7 +91,7 @@ options: version_added: "2.1" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade"] ''' diff --git a/lib/ansible/modules/cloud/openstack/os_group.py b/lib/ansible/modules/cloud/openstack/os_group.py index d6a3ca93b59..1cebc0c63d8 100644 --- a/lib/ansible/modules/cloud/openstack/os_group.py +++ b/lib/ansible/modules/cloud/openstack/os_group.py @@ -52,7 +52,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_image.py b/lib/ansible/modules/cloud/openstack/os_image.py index b167d106c56..6785c591af2 100644 --- a/lib/ansible/modules/cloud/openstack/os_image.py +++ b/lib/ansible/modules/cloud/openstack/os_image.py @@ -95,7 +95,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade"] ''' diff --git a/lib/ansible/modules/cloud/openstack/os_image_facts.py b/lib/ansible/modules/cloud/openstack/os_image_facts.py index 4a2db5fd223..cfc94b15e09 100644 --- a/lib/ansible/modules/cloud/openstack/os_image_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_image_facts.py @@ -39,7 +39,7 @@ options: required: true availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_ironic.py b/lib/ansible/modules/cloud/openstack/os_ironic.py index 8c6848e8db3..b73df68b6e2 100644 --- a/lib/ansible/modules/cloud/openstack/os_ironic.py +++ b/lib/ansible/modules/cloud/openstack/os_ironic.py @@ -121,7 +121,7 @@ options: default: false availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade", "jsonpatch"] diff --git a/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py b/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py index 398de906081..c402ae12998 100644 --- a/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py +++ b/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py @@ -61,7 +61,7 @@ options: default: 1200 availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade"] diff --git a/lib/ansible/modules/cloud/openstack/os_ironic_node.py b/lib/ansible/modules/cloud/openstack/os_ironic_node.py index 8852f52f0ed..721906718bc 100644 --- a/lib/ansible/modules/cloud/openstack/os_ironic_node.py +++ b/lib/ansible/modules/cloud/openstack/os_ironic_node.py @@ -109,7 +109,7 @@ options: version_added: "2.1" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_keypair.py b/lib/ansible/modules/cloud/openstack/os_keypair.py index 7405678dfc1..e83c3738261 100644 --- a/lib/ansible/modules/cloud/openstack/os_keypair.py +++ b/lib/ansible/modules/cloud/openstack/os_keypair.py @@ -56,7 +56,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: [] ''' diff --git a/lib/ansible/modules/cloud/openstack/os_keystone_domain.py b/lib/ansible/modules/cloud/openstack/os_keystone_domain.py index f14445259e2..9bbcec43a85 100644 --- a/lib/ansible/modules/cloud/openstack/os_keystone_domain.py +++ b/lib/ansible/modules/cloud/openstack/os_keystone_domain.py @@ -54,7 +54,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py b/lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py index e28d621eaa5..289f781d7ed 100644 --- a/lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py @@ -44,7 +44,7 @@ options: default: None availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_keystone_role.py b/lib/ansible/modules/cloud/openstack/os_keystone_role.py index 95207329b63..eab23d2d76a 100644 --- a/lib/ansible/modules/cloud/openstack/os_keystone_role.py +++ b/lib/ansible/modules/cloud/openstack/os_keystone_role.py @@ -40,7 +40,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_keystone_service.py b/lib/ansible/modules/cloud/openstack/os_keystone_service.py index c90abdc5d8a..349d6adf4fd 100644 --- a/lib/ansible/modules/cloud/openstack/os_keystone_service.py +++ b/lib/ansible/modules/cloud/openstack/os_keystone_service.py @@ -56,7 +56,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_network.py b/lib/ansible/modules/cloud/openstack/os_network.py index e12b1d34168..9f1b5615f0f 100644 --- a/lib/ansible/modules/cloud/openstack/os_network.py +++ b/lib/ansible/modules/cloud/openstack/os_network.py @@ -85,7 +85,7 @@ options: version_added: "2.1" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade"] ''' diff --git a/lib/ansible/modules/cloud/openstack/os_networks_facts.py b/lib/ansible/modules/cloud/openstack/os_networks_facts.py index 66902e1f801..8e0f145fdbc 100644 --- a/lib/ansible/modules/cloud/openstack/os_networks_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_networks_facts.py @@ -43,7 +43,7 @@ options: required: false availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_nova_flavor.py b/lib/ansible/modules/cloud/openstack/os_nova_flavor.py index 07e29157054..ff8be62d08f 100644 --- a/lib/ansible/modules/cloud/openstack/os_nova_flavor.py +++ b/lib/ansible/modules/cloud/openstack/os_nova_flavor.py @@ -85,7 +85,7 @@ options: default: "auto" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extra_specs: description: diff --git a/lib/ansible/modules/cloud/openstack/os_object.py b/lib/ansible/modules/cloud/openstack/os_object.py index 0cd72838a9c..751ddef672a 100644 --- a/lib/ansible/modules/cloud/openstack/os_object.py +++ b/lib/ansible/modules/cloud/openstack/os_object.py @@ -57,7 +57,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_port.py b/lib/ansible/modules/cloud/openstack/os_port.py index 5fd6a63b98d..fac7d75eb8b 100644 --- a/lib/ansible/modules/cloud/openstack/os_port.py +++ b/lib/ansible/modules/cloud/openstack/os_port.py @@ -104,7 +104,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_port_facts.py b/lib/ansible/modules/cloud/openstack/os_port_facts.py index ef0c63c7f97..5e5e3ce235a 100644 --- a/lib/ansible/modules/cloud/openstack/os_port_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_port_facts.py @@ -48,7 +48,7 @@ options: default: null availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_project.py b/lib/ansible/modules/cloud/openstack/os_project.py index 27b2040335f..73f41301ccf 100644 --- a/lib/ansible/modules/cloud/openstack/os_project.py +++ b/lib/ansible/modules/cloud/openstack/os_project.py @@ -61,7 +61,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_project_facts.py b/lib/ansible/modules/cloud/openstack/os_project_facts.py index d0cd7945e10..983d7b44595 100644 --- a/lib/ansible/modules/cloud/openstack/os_project_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_project_facts.py @@ -49,7 +49,7 @@ options: default: None availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_quota.py b/lib/ansible/modules/cloud/openstack/os_quota.py index 502b298b9c3..38a08617af1 100644 --- a/lib/ansible/modules/cloud/openstack/os_quota.py +++ b/lib/ansible/modules/cloud/openstack/os_quota.py @@ -165,7 +165,7 @@ options: description: Number of LVM volumes to allow. availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false diff --git a/lib/ansible/modules/cloud/openstack/os_recordset.py b/lib/ansible/modules/cloud/openstack/os_recordset.py index 01b2f457982..851502531b2 100644 --- a/lib/ansible/modules/cloud/openstack/os_recordset.py +++ b/lib/ansible/modules/cloud/openstack/os_recordset.py @@ -64,7 +64,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_router.py b/lib/ansible/modules/cloud/openstack/os_router.py index f2bbabdb2a1..3e83684cd1f 100644 --- a/lib/ansible/modules/cloud/openstack/os_router.py +++ b/lib/ansible/modules/cloud/openstack/os_router.py @@ -76,7 +76,7 @@ options: default: None availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade"] ''' diff --git a/lib/ansible/modules/cloud/openstack/os_security_group.py b/lib/ansible/modules/cloud/openstack/os_security_group.py index c5c4cc8af00..be93954c758 100644 --- a/lib/ansible/modules/cloud/openstack/os_security_group.py +++ b/lib/ansible/modules/cloud/openstack/os_security_group.py @@ -48,7 +48,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_security_group_rule.py b/lib/ansible/modules/cloud/openstack/os_security_group_rule.py index 3de56e29e07..0192b389fc7 100644 --- a/lib/ansible/modules/cloud/openstack/os_security_group_rule.py +++ b/lib/ansible/modules/cloud/openstack/os_security_group_rule.py @@ -78,7 +78,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: ["shade"] ''' diff --git a/lib/ansible/modules/cloud/openstack/os_server_actions.py b/lib/ansible/modules/cloud/openstack/os_server_actions.py index 1bc695e3eb6..351672ee0ee 100644 --- a/lib/ansible/modules/cloud/openstack/os_server_actions.py +++ b/lib/ansible/modules/cloud/openstack/os_server_actions.py @@ -62,7 +62,7 @@ options: version_added: "2.3" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_server_facts.py b/lib/ansible/modules/cloud/openstack/os_server_facts.py index da5dff6a385..71e91a0db8f 100644 --- a/lib/ansible/modules/cloud/openstack/os_server_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_server_facts.py @@ -49,7 +49,7 @@ options: default: false availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_server_group.py b/lib/ansible/modules/cloud/openstack/os_server_group.py index da5a11eb1aa..9b7cc9b998e 100644 --- a/lib/ansible/modules/cloud/openstack/os_server_group.py +++ b/lib/ansible/modules/cloud/openstack/os_server_group.py @@ -50,7 +50,7 @@ options: required: false availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_server_volume.py b/lib/ansible/modules/cloud/openstack/os_server_volume.py index 56d3f05755f..ffd2df2ffc4 100644 --- a/lib/ansible/modules/cloud/openstack/os_server_volume.py +++ b/lib/ansible/modules/cloud/openstack/os_server_volume.py @@ -52,7 +52,7 @@ options: default: None availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_stack.py b/lib/ansible/modules/cloud/openstack/os_stack.py index 70828aa2597..a9334985662 100644 --- a/lib/ansible/modules/cloud/openstack/os_stack.py +++ b/lib/ansible/modules/cloud/openstack/os_stack.py @@ -69,7 +69,7 @@ options: default: 3600 availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_subnet.py b/lib/ansible/modules/cloud/openstack/os_subnet.py index c8a09e1c573..a6cc03d9941 100644 --- a/lib/ansible/modules/cloud/openstack/os_subnet.py +++ b/lib/ansible/modules/cloud/openstack/os_subnet.py @@ -123,7 +123,7 @@ options: version_added: "2.1" availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_subnets_facts.py b/lib/ansible/modules/cloud/openstack/os_subnets_facts.py index efe0467cb0c..75b4579ce02 100644 --- a/lib/ansible/modules/cloud/openstack/os_subnets_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_subnets_facts.py @@ -43,7 +43,7 @@ options: required: false availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false extends_documentation_fragment: openstack ''' diff --git a/lib/ansible/modules/cloud/openstack/os_user.py b/lib/ansible/modules/cloud/openstack/os_user.py index 91af667e28b..d6ec91f3e49 100644 --- a/lib/ansible/modules/cloud/openstack/os_user.py +++ b/lib/ansible/modules/cloud/openstack/os_user.py @@ -77,7 +77,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_user_facts.py b/lib/ansible/modules/cloud/openstack/os_user_facts.py index f96dd88c6f2..c4de48033f1 100644 --- a/lib/ansible/modules/cloud/openstack/os_user_facts.py +++ b/lib/ansible/modules/cloud/openstack/os_user_facts.py @@ -49,7 +49,7 @@ options: default: None availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false ''' diff --git a/lib/ansible/modules/cloud/openstack/os_user_group.py b/lib/ansible/modules/cloud/openstack/os_user_group.py index 3c2ce5b914b..4e2984e91c9 100644 --- a/lib/ansible/modules/cloud/openstack/os_user_group.py +++ b/lib/ansible/modules/cloud/openstack/os_user_group.py @@ -44,7 +44,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_user_role.py b/lib/ansible/modules/cloud/openstack/os_user_role.py index 25191cfb6c0..1cdd7690d54 100644 --- a/lib/ansible/modules/cloud/openstack/os_user_role.py +++ b/lib/ansible/modules/cloud/openstack/os_user_role.py @@ -66,7 +66,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_volume.py b/lib/ansible/modules/cloud/openstack/os_volume.py index 96476b197d4..736ce242eb4 100644 --- a/lib/ansible/modules/cloud/openstack/os_volume.py +++ b/lib/ansible/modules/cloud/openstack/os_volume.py @@ -73,7 +73,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/openstack/os_zone.py b/lib/ansible/modules/cloud/openstack/os_zone.py index 848fe483769..3a81f80614d 100644 --- a/lib/ansible/modules/cloud/openstack/os_zone.py +++ b/lib/ansible/modules/cloud/openstack/os_zone.py @@ -66,7 +66,7 @@ options: default: present availability_zone: description: - - Ignored. Present for backwards compatability + - Ignored. Present for backwards compatibility required: false requirements: - "python >= 2.6" diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py b/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py index 7552bb5dda3..c8cea6c50a5 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py @@ -138,7 +138,7 @@ options: migration_bandwidth: description: - "The bandwidth settings define the maximum bandwidth of both outgoing and incoming migrations per host." - - "Following bandwith options are supported:" + - "Following bandwidth options are supported:" - "C(auto) - Bandwidth is copied from the I(rate limit) [Mbps] setting in the data center host network QoS." - "C(hypervisor_default) - Bandwidth is controlled by local VDSM setting on sending host." - "C(custom) - Defined by user (in Mbps)." diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py b/lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py index 25b874bd01b..469d1929fd6 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py @@ -51,7 +51,7 @@ options: - "Default value is set by oVirt/RHV engine to I(false)." ranges: description: - - "List of MAC ranges. The from and to should be splitted by comma." + - "List of MAC ranges. The from and to should be split by comma." - "For example: 00:1a:4a:16:01:51,00:1a:4a:16:01:61" extends_documentation_fragment: ovirt ''' diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py index ae9de791290..e430c4063e2 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py @@ -85,7 +85,7 @@ options: - "C(lun_id) - LUN id(s)." - "C(username) - A CHAP user name for logging into a target." - "C(password) - A CHAP password for logging into a target." - - "C(override_luns) - If I(True) ISCSI storage domain luns will be overriden before adding." + - "C(override_luns) - If I(True) ISCSI storage domain luns will be overridden before adding." - "Note that these parameters are not idempotent." posixfs: description: diff --git a/lib/ansible/modules/cloud/smartos/vmadm.py b/lib/ansible/modules/cloud/smartos/vmadm.py index 45e3ba89951..02daccf4b7d 100644 --- a/lib/ansible/modules/cloud/smartos/vmadm.py +++ b/lib/ansible/modules/cloud/smartos/vmadm.py @@ -683,7 +683,7 @@ def main(): uuid = p['uuid'] state = p['state'] - # Translate the state paramter into something we can use later on. + # Translate the state parameter into something we can use later on. if state in ['present', 'running']: vm_state = 'running' elif state in ['stopped', 'created']: diff --git a/lib/ansible/modules/cloud/vmware/vca_nat.py b/lib/ansible/modules/cloud/vmware/vca_nat.py index 19f7a66876a..e2d5bb192da 100644 --- a/lib/ansible/modules/cloud/vmware/vca_nat.py +++ b/lib/ansible/modules/cloud/vmware/vca_nat.py @@ -34,7 +34,7 @@ author: Peter Sprygada (@privateip) options: purge_rules: description: - - If set to true, it will delete all rules in the gateway that are not given as paramter to this module. + - If set to true, it will delete all rules in the gateway that are not given as parameter to this module. required: false default: false nat_rules: diff --git a/lib/ansible/modules/crypto/openssl_csr.py b/lib/ansible/modules/crypto/openssl_csr.py index d69eaffd1f7..70366bfecbd 100644 --- a/lib/ansible/modules/crypto/openssl_csr.py +++ b/lib/ansible/modules/crypto/openssl_csr.py @@ -68,7 +68,7 @@ options: subjectAltName: required: false description: - - SAN extention to attach to the certificate signing request + - SAN extension to attach to the certificate signing request countryName: required: false aliases: [ 'C' ] @@ -114,7 +114,7 @@ EXAMPLES = ''' privatekey_path: /etc/ssl/private/ansible.com.pem commonName: www.ansible.com -# Generate an OpenSSL Certificate Signing Request with Subject informations +# Generate an OpenSSL Certificate Signing Request with Subject information - openssl_csr: path: /etc/ssl/csr/www.ansible.com.csr privatekey_path: /etc/ssl/private/ansible.com.pem @@ -253,7 +253,7 @@ class CertificateSigningRequest(object): self.changed = False def dump(self): - '''Serialize the object into a dictionnary.''' + '''Serialize the object into a dictionary.''' result = { 'csr': self.path, diff --git a/lib/ansible/modules/crypto/openssl_privatekey.py b/lib/ansible/modules/crypto/openssl_privatekey.py index 59acb7f0826..ee85a4f0d4b 100644 --- a/lib/ansible/modules/crypto/openssl_privatekey.py +++ b/lib/ansible/modules/crypto/openssl_privatekey.py @@ -182,7 +182,7 @@ class PrivateKey(object): def dump(self): - """Serialize the object into a dictionnary.""" + """Serialize the object into a dictionary.""" result = { 'size': self.size, diff --git a/lib/ansible/modules/crypto/openssl_publickey.py b/lib/ansible/modules/crypto/openssl_publickey.py index 3a56e58c6c3..e4be8e0dd40 100644 --- a/lib/ansible/modules/crypto/openssl_publickey.py +++ b/lib/ansible/modules/crypto/openssl_publickey.py @@ -53,7 +53,7 @@ options: privatekey_path: required: true description: - - Path to the TLS/SSL private key from which to genereate the public key. + - Path to the TLS/SSL private key from which to generate the public key. ''' EXAMPLES = ''' @@ -153,7 +153,7 @@ class PublicKey(object): self.changed = False def dump(self): - """Serialize the object into a dictionnary.""" + """Serialize the object into a dictionary.""" result = { 'privatekey': self.privatekey_path, diff --git a/lib/ansible/modules/database/misc/kibana_plugin.py b/lib/ansible/modules/database/misc/kibana_plugin.py index 8cfbd47c505..3ce5d9a413d 100644 --- a/lib/ansible/modules/database/misc/kibana_plugin.py +++ b/lib/ansible/modules/database/misc/kibana_plugin.py @@ -110,7 +110,7 @@ url: returned: success type: string timeout: - description: the timout for plugin download + description: the timeout for plugin download returned: success type: string stdout: diff --git a/lib/ansible/modules/database/postgresql/postgresql_privs.py b/lib/ansible/modules/database/postgresql/postgresql_privs.py index 5b152193f56..8f8aa9d3d9d 100644 --- a/lib/ansible/modules/database/postgresql/postgresql_privs.py +++ b/lib/ansible/modules/database/postgresql/postgresql_privs.py @@ -660,7 +660,7 @@ def main(): except psycopg2.Error: e = get_exception() conn.rollback() - # psycopg2 errors come in connection encoding, reencode + # psycopg2 errors come in connection encoding, re-encode msg = e.message.decode(conn.encoding).encode(sys.getdefaultencoding(), 'replace') module.fail_json(msg=msg) diff --git a/lib/ansible/modules/files/blockinfile.py b/lib/ansible/modules/files/blockinfile.py index 62983f1fc08..1bf29fced79 100644 --- a/lib/ansible/modules/files/blockinfile.py +++ b/lib/ansible/modules/files/blockinfile.py @@ -71,7 +71,7 @@ options: - If specified, the block will be inserted after the last match of specified regular expression. A special value is available; C(EOF) for inserting the block at the end of the file. If specified regular - expresion has no matches, C(EOF) will be used instead. + expression has no matches, C(EOF) will be used instead. choices: [ 'EOF', '*regex*' ] insertbefore: required: false @@ -80,7 +80,7 @@ options: - If specified, the block will be inserted before the last match of specified regular expression. A special value is available; C(BOF) for inserting the block at the beginning of the file. If specified regular - expresion has no matches, the block will be inserted at the end of the + expression has no matches, the block will be inserted at the end of the file. choices: [ 'BOF', '*regex*' ] create: diff --git a/lib/ansible/modules/files/stat.py b/lib/ansible/modules/files/stat.py index 461e47b5dab..904958eaa52 100644 --- a/lib/ansible/modules/files/stat.py +++ b/lib/ansible/modules/files/stat.py @@ -404,7 +404,7 @@ def format_output(module, path, st): isgid=bool(mode & stat.S_ISGID), ) - # Platform dependant flags: + # Platform dependent flags: for other in [ # Some Linux ('st_blocks', 'blocks'), diff --git a/lib/ansible/modules/identity/ipa/ipa_host.py b/lib/ansible/modules/identity/ipa/ipa_host.py index d3b77dad292..c6c1c96ce64 100644 --- a/lib/ansible/modules/identity/ipa/ipa_host.py +++ b/lib/ansible/modules/identity/ipa/ipa_host.py @@ -73,7 +73,7 @@ options: description: - List of Base-64 encoded server certificates. - If option is omitted certificates will not be checked or changed. - - If an emtpy list is passed all assigned certificates will be removed. + - If an empty list is passed all assigned certificates will be removed. - Certificates already assigned but not passed will be removed. required: false aliases: ["usercertificate"] diff --git a/lib/ansible/modules/identity/ipa/ipa_sudorule.py b/lib/ansible/modules/identity/ipa/ipa_sudorule.py index ef70133c1b5..74f4a3c2d9e 100644 --- a/lib/ansible/modules/identity/ipa/ipa_sudorule.py +++ b/lib/ansible/modules/identity/ipa/ipa_sudorule.py @@ -119,7 +119,7 @@ version_added: "2.3" ''' EXAMPLES = ''' -# Ensure sudo rule is present thats allows all every body to execute any command on any host without beeing asked for a password. +# Ensure sudo rule is present that's allows all every body to execute any command on any host without being asked for a password. - ipa_sudorule: name: sudo_all_nopasswd cmdcategory: all diff --git a/lib/ansible/modules/monitoring/monit.py b/lib/ansible/modules/monitoring/monit.py index a9b4cd061d1..4118d3ff0c3 100644 --- a/lib/ansible/modules/monitoring/monit.py +++ b/lib/ansible/modules/monitoring/monit.py @@ -99,7 +99,7 @@ def main(): return status() def wait_for_monit_to_stop_pending(): - """Fails this run if there is no status or it's pending/initalizing for timeout""" + """Fails this run if there is no status or it's pending/initializing for timeout""" timeout_time = time.time() + timeout sleep_time = 5 diff --git a/lib/ansible/modules/monitoring/sensu_check.py b/lib/ansible/modules/monitoring/sensu_check.py index 814fe68bf8a..8606bb6070a 100644 --- a/lib/ansible/modules/monitoring/sensu_check.py +++ b/lib/ansible/modules/monitoring/sensu_check.py @@ -146,12 +146,12 @@ options: default: no low_flap_threshold: description: - - The low threshhold for flap detection + - The low threshold for flap detection required: false default: null high_flap_threshold: description: - - The high threshhold for flap detection + - The high threshold for flap detection required: false default: null custom: diff --git a/lib/ansible/modules/net_tools/basics/uri.py b/lib/ansible/modules/net_tools/basics/uri.py index d14b7d21656..71b9707b5a9 100644 --- a/lib/ansible/modules/net_tools/basics/uri.py +++ b/lib/ansible/modules/net_tools/basics/uri.py @@ -471,7 +471,7 @@ def main(): else: changed = False - # Transmogrify the headers, replacing '-' with '_', since variables dont + # Transmogrify the headers, replacing '-' with '_', since variables don't # work with dashes. # In python3, the headers are title cased. Lowercase them to be # compatible with the python2 behaviour. diff --git a/lib/ansible/modules/net_tools/exoscale/exo_dns_domain.py b/lib/ansible/modules/net_tools/exoscale/exo_dns_domain.py index 6b5274f2df3..7526c29247c 100644 --- a/lib/ansible/modules/net_tools/exoscale/exo_dns_domain.py +++ b/lib/ansible/modules/net_tools/exoscale/exo_dns_domain.py @@ -179,7 +179,7 @@ exo_dns_domain: type: int sample: null whois_protected: - description: Wheter the whois is protected or not + description: Whether the whois is protected or not returned: success type: bool sample: false diff --git a/lib/ansible/modules/net_tools/omapi_host.py b/lib/ansible/modules/net_tools/omapi_host.py index 6f47de8fb7e..b3467fd3426 100644 --- a/lib/ansible/modules/net_tools/omapi_host.py +++ b/lib/ansible/modules/net_tools/omapi_host.py @@ -115,7 +115,7 @@ changed: returned: success type: string lease: - description: dictionnary containing host informations + description: dictionary containing host information returned: success type: complex contains: diff --git a/lib/ansible/modules/network/cumulus/_cl_bond.py b/lib/ansible/modules/network/cumulus/_cl_bond.py index 4e628bf58c2..ba919b46553 100644 --- a/lib/ansible/modules/network/cumulus/_cl_bond.py +++ b/lib/ansible/modules/network/cumulus/_cl_bond.py @@ -247,7 +247,7 @@ def current_iface_config(module): def build_address(module): - # if addr_method == 'dhcp', dont add IP address + # if addr_method == 'dhcp', don't add IP address if module.params.get('addr_method') == 'dhcp': return _ipv4 = module.params.get('ipv4') diff --git a/lib/ansible/modules/network/cumulus/_cl_bridge.py b/lib/ansible/modules/network/cumulus/_cl_bridge.py index c3131dc64a5..516c4e10934 100644 --- a/lib/ansible/modules/network/cumulus/_cl_bridge.py +++ b/lib/ansible/modules/network/cumulus/_cl_bridge.py @@ -195,7 +195,7 @@ def current_iface_config(module): def build_address(module): - # if addr_method == 'dhcp', dont add IP address + # if addr_method == 'dhcp', don't add IP address if module.params.get('addr_method') == 'dhcp': return _ipv4 = module.params.get('ipv4') diff --git a/lib/ansible/modules/network/cumulus/_cl_interface.py b/lib/ansible/modules/network/cumulus/_cl_interface.py index 87cac42ac7f..a1574727008 100644 --- a/lib/ansible/modules/network/cumulus/_cl_interface.py +++ b/lib/ansible/modules/network/cumulus/_cl_interface.py @@ -240,7 +240,7 @@ def current_iface_config(module): def build_address(module): - # if addr_method == 'dhcp', dont add IP address + # if addr_method == 'dhcp', don't add IP address if module.params.get('addr_method') == 'dhcp': return _ipv4 = module.params.get('ipv4') diff --git a/lib/ansible/modules/network/f5/bigip_ssl_certificate.py b/lib/ansible/modules/network/f5/bigip_ssl_certificate.py index f838971f104..b1536ae9eeb 100644 --- a/lib/ansible/modules/network/f5/bigip_ssl_certificate.py +++ b/lib/ansible/modules/network/f5/bigip_ssl_certificate.py @@ -251,7 +251,7 @@ class BigIpSslCertificate(object): key_content = self.params['key_content'] passphrase = self.params['passphrase'] - # Technically you dont need to provide us with anything in the form + # Technically you don't need to provide us with anything in the form # of content for your cert, but that's kind of illogical, so we just # return saying you didn't "do" anything if you left the cert and keys # empty. diff --git a/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py b/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py index 70187435df1..99b3f15f231 100644 --- a/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py +++ b/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py @@ -126,7 +126,7 @@ options: logtraffic_start: version_added: "2.4" description: - - Logs begining of session as well. + - Logs beginning of session as well. default: false choices: ["true", "false"] comment: @@ -168,7 +168,7 @@ EXAMPLES = """ RETURN = """ firewall_address_config: - description: full firewall adresses config string + description: full firewall addresses config string returned: always type: string change_string: diff --git a/lib/ansible/modules/network/lenovo/cnos_interface.py b/lib/ansible/modules/network/lenovo/cnos_interface.py index 4702ce0b518..49730ee5cab 100644 --- a/lib/ansible/modules/network/lenovo/cnos_interface.py +++ b/lib/ansible/modules/network/lenovo/cnos_interface.py @@ -78,7 +78,7 @@ options: required: No default: Null choices: [aggregation-group number, access or mode or trunk, description, auto or full or half, - recieve or send, port-priority, suspend-individual, timeout, receive or transmit or trap-notification, + receive or send, port-priority, suspend-individual, timeout, receive or transmit or trap-notification, tlv-select, Load interval delay in seconds, counter, Name for the MAC Access List, mac-address in HHHH.HHHH.HHHH format, THRESHOLD Value in unit of buffer cell, <64-9216> MTU in bytes-<64-9216> for L2 packet,<576-9216> for L3 IPv4 packet, <1280-9216> for L3 IPv6 packet, enter the instance id, input or output, copp-system-policy, @@ -94,7 +94,7 @@ options: mac-phy-status or management-address or max-frame-size or port-description or port-protocol-vlan or port-vlan or power-mdi or protocol-identity or system-capabilities or system-description or system-name or vid-management or vlan-name, counter for load interval, policy input name, all or Copp class name to attach, - qos, queing, Enter the allowed traffic level, ipv6] + qos, queueing, Enter the allowed traffic level, ipv6] interfaceArg4: description: - This is an overloaded interface fourth argument. Usage of this argument can be found is the User Guide referenced above. diff --git a/lib/ansible/modules/network/lenovo/cnos_portchannel.py b/lib/ansible/modules/network/lenovo/cnos_portchannel.py index 4e609d4000f..7337d670db9 100644 --- a/lib/ansible/modules/network/lenovo/cnos_portchannel.py +++ b/lib/ansible/modules/network/lenovo/cnos_portchannel.py @@ -65,7 +65,7 @@ options: required: No default: Null choices: [aggregation-group number, access or mode or trunk, description, auto or full or half, - recieve or send, port-priority, suspend-individual, timeout, receive or transmit or trap-notification, + receive or send, port-priority, suspend-individual, timeout, receive or transmit or trap-notification, tlv-select, Load interval delay in seconds, counter, Name for the MAC Access List, mac-address in HHHH.HHHH.HHHH format, THRESHOLD Value in unit of buffer cell, <64-9216> MTU in bytes-<64-9216> for L2 packet,<576-9216> for L3 IPv4 packet, <1280-9216> for L3 IPv6 packet, enter the instance id, input or output, copp-system-policy, @@ -81,7 +81,7 @@ options: mac-phy-status or management-address or max-frame-size or port-description or port-protocol-vlan or port-vlan or power-mdi or protocol-identity or system-capabilities or system-description or system-name or vid-management or vlan-name, counter for load interval, policy input name, all or Copp class name to attach, - qos, queing, Enter the allowed traffic level, ipv6] + qos, queueing, Enter the allowed traffic level, ipv6] interfaceArg4: description: - This is an overloaded Port Channel fourth argument. Usage of this argument can be found is the User Guide referenced above. diff --git a/lib/ansible/modules/network/ordnance/ordnance_config.py b/lib/ansible/modules/network/ordnance/ordnance_config.py index 5256142ebd8..d95f51744dd 100644 --- a/lib/ansible/modules/network/ordnance/ordnance_config.py +++ b/lib/ansible/modules/network/ordnance/ordnance_config.py @@ -103,7 +103,7 @@ options: choices: ['line', 'block'] multiline_delimiter: description: - - This arugment is used when pushing a multiline configuration + - This argument is used when pushing a multiline configuration element to the Ordnance router. It specifies the character to use as the delimiting character. This only applies to the configuration action diff --git a/lib/ansible/modules/network/panos/panos_cert_gen_ssh.py b/lib/ansible/modules/network/panos/panos_cert_gen_ssh.py index 398e81bc821..24ec5b52ca4 100644 --- a/lib/ansible/modules/network/panos/panos_cert_gen_ssh.py +++ b/lib/ansible/modules/network/panos/panos_cert_gen_ssh.py @@ -55,7 +55,7 @@ options: default: null cert_cn: description: - - Certificate CN (common name) embeded in the certificate signature. + - Certificate CN (common name) embedded in the certificate signature. required: true default: null signed_by: @@ -126,7 +126,7 @@ def generate_cert(module, ip_address, key_filename, password, client = paramiko.SSHClient() # add policy to accept all host keys, I haven't found - # a way to retreive the instance SSH key fingerprint from AWS + # a way to retrieve the instance SSH key fingerprint from AWS client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) if not key_filename: diff --git a/lib/ansible/modules/notification/hall.py b/lib/ansible/modules/notification/hall.py index 30e9cef7a97..65b58110714 100644 --- a/lib/ansible/modules/notification/hall.py +++ b/lib/ansible/modules/notification/hall.py @@ -38,7 +38,7 @@ options: required: true msg: description: - - The message you wish to deliver as a notifcation + - The message you wish to deliver as a notification required: true title: description: diff --git a/lib/ansible/modules/notification/mattermost.py b/lib/ansible/modules/notification/mattermost.py index e6d30f482d4..a3c0b70610f 100644 --- a/lib/ansible/modules/notification/mattermost.py +++ b/lib/ansible/modules/notification/mattermost.py @@ -43,7 +43,7 @@ options: api_key: description: - Mattermost webhook api key. Log into your mattermost site, go to - Menu -> Integration -> Incomming Webhook -> Add Incomming Webhook. + Menu -> Integration -> Incoming Webhook -> Add Incoming Webhook. This will give you full URL. api_key is the last part. http://mattermost.example.com/hooks/C(API_KEY) required: true @@ -147,7 +147,7 @@ def main(): if module.check_mode is False: response, info = fetch_url(module=module, url=webhook_url, headers=headers, method='POST', data=payload) - #somthing's wrong + #something's wrong if info['status'] != 200: #some problem result['msg'] = "Failed to send mattermost message, the error was: {0}".format(info['msg']) diff --git a/lib/ansible/modules/notification/rocketchat.py b/lib/ansible/modules/notification/rocketchat.py index 1675c73ca4b..78a46e787dc 100644 --- a/lib/ansible/modules/notification/rocketchat.py +++ b/lib/ansible/modules/notification/rocketchat.py @@ -60,7 +60,7 @@ options: channel: description: - Channel to send the message to. If absent, the message goes to the channel selected for the I(token) - specifed during the creation of webhook. + specified during the creation of webhook. required: false default: None username: diff --git a/lib/ansible/modules/packaging/os/apk.py b/lib/ansible/modules/packaging/os/apk.py index f9f8e06079a..59425c01cdc 100644 --- a/lib/ansible/modules/packaging/os/apk.py +++ b/lib/ansible/modules/packaging/os/apk.py @@ -42,7 +42,7 @@ options: version_added: "2.4" name: description: - - A package name, like C(foo), or mutliple packages, like C(foo, bar). + - A package name, like C(foo), or multiple packages, like C(foo, bar). required: false default: null repository: diff --git a/lib/ansible/modules/packaging/os/redhat_subscription.py b/lib/ansible/modules/packaging/os/redhat_subscription.py index 3ef66d6b5a0..7c7ca858dd7 100644 --- a/lib/ansible/modules/packaging/os/redhat_subscription.py +++ b/lib/ansible/modules/packaging/os/redhat_subscription.py @@ -404,7 +404,7 @@ class Rhsm(RegistrationBase): to those pools. Since a pool id is a more specific match, we only fallback to matching - against names if we didnt match pool ids. + against names if we didn't match pool ids. Raises: * Exception - if error occurs while running command diff --git a/lib/ansible/modules/packaging/os/swupd.py b/lib/ansible/modules/packaging/os/swupd.py index 37c6d717659..c7a1b5b8a9c 100644 --- a/lib/ansible/modules/packaging/os/swupd.py +++ b/lib/ansible/modules/packaging/os/swupd.py @@ -269,7 +269,7 @@ class Swupd(object): self.msg = "Failed to check for updates" def verify_os(self): - """Verifies filesystem agains specified or current version""" + """Verifies filesystem against specified or current version""" if self.module.check_mode: self.module.exit_json(changed=self._needs_verify()) diff --git a/lib/ansible/modules/remote_management/stacki/stacki_host.py b/lib/ansible/modules/remote_management/stacki/stacki_host.py index 425904211c4..6cb0e46689f 100644 --- a/lib/ansible/modules/remote_management/stacki/stacki_host.py +++ b/lib/ansible/modules/remote_management/stacki/stacki_host.py @@ -133,7 +133,7 @@ class StackiHost: auth_creds = {'USERNAME': module.params['stacki_user'], 'PASSWORD': module.params['stacki_password']} - # Get Intial CSRF + # Get Initial CSRF cred_a = self.do_request(self.module, self.endpoint, method="GET") cookie_a = cred_a.headers.get('Set-Cookie').split(';') init_csrftoken = None diff --git a/lib/ansible/modules/source_control/git.py b/lib/ansible/modules/source_control/git.py index 902339172f8..78693539087 100644 --- a/lib/ansible/modules/source_control/git.py +++ b/lib/ansible/modules/source_control/git.py @@ -248,7 +248,7 @@ EXAMPLES = ''' RETURN = ''' after: - description: last commit revision of the repository retrived during the update + description: last commit revision of the repository retrieved during the update returned: success type: string sample: 4c020102a9cd6fe908c9a4a326a38f972f63a903 diff --git a/lib/ansible/modules/storage/infinidat/infini_export_client.py b/lib/ansible/modules/storage/infinidat/infini_export_client.py index 1fa17f2b79f..721c08f9277 100644 --- a/lib/ansible/modules/storage/infinidat/infini_export_client.py +++ b/lib/ansible/modules/storage/infinidat/infini_export_client.py @@ -75,7 +75,7 @@ EXAMPLES = ''' password: secret system: ibox001 -- name: Add multiple clients with RO access. Squash root priviledges +- name: Add multiple clients with RO access. Squash root privileges infini_export_client: client: "{{ item }}" access_mode: RO diff --git a/lib/ansible/modules/storage/netapp/netapp_e_host.py b/lib/ansible/modules/storage/netapp/netapp_e_host.py index 8890c58d6f7..acba79c7fa4 100644 --- a/lib/ansible/modules/storage/netapp/netapp_e_host.py +++ b/lib/ansible/modules/storage/netapp/netapp_e_host.py @@ -54,7 +54,7 @@ options: required: True name: description: - - If the host doesnt yet exist, the label to assign at creation time. + - If the host doesn't yet exist, the label to assign at creation time. - If the hosts already exists, this is what is used to identify the host to apply any desired changes required: True host_type_index: @@ -204,7 +204,7 @@ class Host(object): if len(self.available_ports) > 0 and len(self.ports) <= len(self.available_ports): for port in self.ports: for free_port in self.available_ports: - # Desired Type matches but also make sure we havent already used the ID + # Desired Type matches but also make sure we haven't already used the ID if not free_port['id'] in used_ids: # update the port arg to have an id attribute used_ids.append(free_port['id']) @@ -318,7 +318,7 @@ class Host(object): self.post_body['portsToUpdate'].update(dict( portRef=self.other_host['hostPortRef'], hostRef=self.host_obj['id'], - # Doesnt yet address port identifier or chap secret + # Doesn't yet address port identifier or chap secret )) if apply: diff --git a/lib/ansible/modules/storage/netapp/sf_volume_manager.py b/lib/ansible/modules/storage/netapp/sf_volume_manager.py index c16d0a92c1c..db96af3e293 100644 --- a/lib/ansible/modules/storage/netapp/sf_volume_manager.py +++ b/lib/ansible/modules/storage/netapp/sf_volume_manager.py @@ -72,7 +72,7 @@ options: description: - The ID of the volume to manage or update. - In order to create multiple volumes with the same name, but different volume_ids, please declare the I(volume_id) - parameter with an arbitary value. However, the specified volume_id will not be assigned to the newly created + parameter with an arbitrary value. However, the specified volume_id will not be assigned to the newly created volume (since it's an auto-generated property). required: false default: None diff --git a/lib/ansible/modules/system/aix_inittab.py b/lib/ansible/modules/system/aix_inittab.py index 16c59769e17..16098e7dc20 100644 --- a/lib/ansible/modules/system/aix_inittab.py +++ b/lib/ansible/modules/system/aix_inittab.py @@ -91,7 +91,7 @@ EXAMPLES = ''' state: present become: yes -# Change inittab enrty startmyservice to runlevel "2" and processaction "wait". +# Change inittab entry startmyservice to runlevel "2" and processaction "wait". - name: Change startmyservice to inittab aix_inittab: name: startmyservice diff --git a/lib/ansible/modules/system/cronvar.py b/lib/ansible/modules/system/cronvar.py index 7031a2c6aa0..d0680c0cf30 100644 --- a/lib/ansible/modules/system/cronvar.py +++ b/lib/ansible/modules/system/cronvar.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -# Cronvar Plugin: The goal of this plugin is to provide an indempotent +# Cronvar Plugin: The goal of this plugin is to provide an idempotent # method for set cron variable values. It should play well with the # existing cron module as well as allow for manually added variables. # Each variable entered will be preceded with a comment describing the diff --git a/lib/ansible/modules/system/crypttab.py b/lib/ansible/modules/system/crypttab.py index 2b849608af8..45249ed948e 100644 --- a/lib/ansible/modules/system/crypttab.py +++ b/lib/ansible/modules/system/crypttab.py @@ -34,7 +34,7 @@ options: name: description: - Name of the encrypted block device as it appears in the C(/etc/crypttab) file, or - optionaly prefixed with C(/dev/mapper/), as it appears in the filesystem. I(/dev/mapper/) + optionally prefixed with C(/dev/mapper/), as it appears in the filesystem. I(/dev/mapper/) will be stripped from I(name). required: true default: null diff --git a/lib/ansible/modules/system/gconftool2.py b/lib/ansible/modules/system/gconftool2.py index 54fb1eda0e5..68e174dfcea 100644 --- a/lib/ansible/modules/system/gconftool2.py +++ b/lib/ansible/modules/system/gconftool2.py @@ -243,7 +243,7 @@ def main(): # Check if the current value equals the value we want to set. If not, make # a change if current_value != value: - # If check mode, we know a change would have occured. + # If check mode, we know a change would have occurred. if module.check_mode: # So we will set the change to True change = True diff --git a/lib/ansible/modules/system/iptables.py b/lib/ansible/modules/system/iptables.py index 8c6b82ad467..350b396d302 100644 --- a/lib/ansible/modules/system/iptables.py +++ b/lib/ansible/modules/system/iptables.py @@ -139,7 +139,7 @@ options: matches it. The target can be a user-defined chain (other than the one this rule is in), one of the special builtin targets which decide the fate of the packet immediately, or an extension (see EXTENSIONS - below). If this option is omitted in a rule (and the goto paramater + below). If this option is omitted in a rule (and the goto parameter is not used), then matching the rule will have no effect on the packet's fate, but the counters on the rule will be incremented. required: false diff --git a/lib/ansible/modules/system/user.py b/lib/ansible/modules/system/user.py index 3e7a90f61fe..5142274e329 100644 --- a/lib/ansible/modules/system/user.py +++ b/lib/ansible/modules/system/user.py @@ -1652,7 +1652,7 @@ class DarwinUser(User): def _update_system_user(self): '''Hide or show user on login window according SELF.SYSTEM. - Returns 0 if a change has been made, None otherwhise.''' + Returns 0 if a change has been made, None otherwise.''' plist_file = '/Library/Preferences/com.apple.loginwindow.plist' diff --git a/lib/ansible/modules/utilities/logic/wait_for.py b/lib/ansible/modules/utilities/logic/wait_for.py index 083e672bfe1..119085f4a12 100644 --- a/lib/ansible/modules/utilities/logic/wait_for.py +++ b/lib/ansible/modules/utilities/logic/wait_for.py @@ -76,7 +76,7 @@ options: path: version_added: "1.4" description: - - Path to a file on the filesytem that must exist before continuing. + - Path to a file on the filesystem that must exist before continuing. search_regex: version_added: "1.4" description: diff --git a/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_wait.py b/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_wait.py index 7c74e5f1f0e..f36784261b0 100644 --- a/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_wait.py +++ b/lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_wait.py @@ -140,7 +140,7 @@ def main(): params = module.params.copy() # tower-cli gets very noisy when monitoring. - # We pass in our our outfile to supress the out during our monitor call. + # We pass in our our outfile to suppress the out during our monitor call. outfile = StringIO() params['outfile'] = outfile diff --git a/lib/ansible/modules/windows/win_acl_inheritance.ps1 b/lib/ansible/modules/windows/win_acl_inheritance.ps1 index 8b0b56196ce..78b495ba185 100644 --- a/lib/ansible/modules/windows/win_acl_inheritance.ps1 +++ b/lib/ansible/modules/windows/win_acl_inheritance.ps1 @@ -44,7 +44,7 @@ Try { $objACL.SetAccessRuleProtection($False, $False) If ($reorganize) { - # it wont work without intermediate save, state would be the same + # it won't work without intermediate save, state would be the same Set-ACL $path $objACL $objACL = Get-ACL $path diff --git a/lib/ansible/parsing/mod_args.py b/lib/ansible/parsing/mod_args.py index ad0bf9c70af..ba47dd27b45 100644 --- a/lib/ansible/parsing/mod_args.py +++ b/lib/ansible/parsing/mod_args.py @@ -168,7 +168,7 @@ class ModuleArgsParser: args.update(tmp_args) # only internal variables can start with an underscore, so - # we don't allow users to set them directy in arguments + # we don't allow users to set them directly in arguments if args and action not in ('command', 'win_command', 'shell', 'win_shell', 'script', 'raw'): for arg in args: arg = to_text(arg) diff --git a/lib/ansible/parsing/yaml/objects.py b/lib/ansible/parsing/yaml/objects.py index 99913811327..d7b9c2fd652 100644 --- a/lib/ansible/parsing/yaml/objects.py +++ b/lib/ansible/parsing/yaml/objects.py @@ -90,7 +90,7 @@ class AnsibleVaultEncryptedUnicode(yaml.YAMLObject, AnsibleBaseYAMLObject): ciphertext is a byte string (str on PY2, bytestring on PY3). - The .data atttribute is a property that returns the decrypted plaintext + The .data attribute is a property that returns the decrypted plaintext of the ciphertext as a PY2 unicode or PY3 string object. ''' super(AnsibleVaultEncryptedUnicode, self).__init__() diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py index 38091172fda..d0f9c6740fd 100644 --- a/lib/ansible/playbook/base.py +++ b/lib/ansible/playbook/base.py @@ -187,7 +187,7 @@ class Base(with_metaclass(BaseMeta, object)): self._uuid = get_unique_id() # we create a copy of the attributes here due to the fact that - # it was intialized as a class param in the meta class, so we + # it was initialized as a class param in the meta class, so we # need a unique object here (all members contained within are # unique already). self._attributes = self._attributes.copy() diff --git a/lib/ansible/playbook/helpers.py b/lib/ansible/playbook/helpers.py index ab08b6ecc47..ab1dc05f3f7 100644 --- a/lib/ansible/playbook/helpers.py +++ b/lib/ansible/playbook/helpers.py @@ -227,7 +227,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h "later. In the future, this will be an error unless 'static: no' is used " "on the include task. If you do not want missing includes to be considered " "dynamic, use 'static: yes' on the include or set the global ansible.cfg " - "options to make all inclues static for tasks and/or handlers" % include_file, version="2.7" + "options to make all includes static for tasks and/or handlers" % include_file, version="2.7" ) task_list.append(t) continue diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index 631fd805093..8d8df88819b 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -321,7 +321,7 @@ class CallbackBase: self.runner_on_async_failed(host, result._result, jid) def v2_runner_on_file_diff(self, result, diff): - pass # no v1 correspondance + pass # no v1 correspondence def v2_playbook_on_start(self, playbook): self.playbook_on_start() @@ -340,10 +340,10 @@ class CallbackBase: self.playbook_on_task_start(task.name, is_conditional) def v2_playbook_on_cleanup_task_start(self, task): - pass # no v1 correspondance + pass # no v1 correspondence def v2_playbook_on_handler_task_start(self, task): - pass # no v1 correspondance + pass # no v1 correspondence def v2_playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None): self.playbook_on_vars_prompt(varname, private, prompt, encrypt, confirm, salt_size, salt, default) @@ -371,7 +371,7 @@ class CallbackBase: self.on_file_diff(host, result._result['diff']) def v2_playbook_on_include(self, included_file): - pass # no v1 correspondance + pass # no v1 correspondence def v2_runner_item_on_ok(self, result): pass diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index 462a6612f29..12130444f8b 100644 --- a/lib/ansible/plugins/filter/core.py +++ b/lib/ansible/plugins/filter/core.py @@ -559,7 +559,7 @@ class FilterModule(object): 'md5': md5s, # sha1 hex digeset of string 'sha1': checksum_s, - # checksum of string as used by ansible for checksuming files + # checksum of string as used by ansible for checksumming files 'checksum': checksum_s, # generic hashing 'password_hash': get_encrypted_password, diff --git a/lib/ansible/plugins/lookup/mongodb.py b/lib/ansible/plugins/lookup/mongodb.py index 725c762da2f..2605d4e3edd 100644 --- a/lib/ansible/plugins/lookup/mongodb.py +++ b/lib/ansible/plugins/lookup/mongodb.py @@ -186,7 +186,7 @@ class LookupModule(LookupBase): #optional query parameters #we accept any parameter from the normal mongodb query. - # the offical documentation is here + # the official documentation is here # https://api.mongodb.org/python/current/api/pymongo/collection.html?highlight=find#pymongo.collection.Collection.find # filter: { "hostname": "batman" } # projection: { "pid": True , "_id" : False , "hostname" : True } diff --git a/lib/ansible/utils/module_docs_fragments/fortios.py b/lib/ansible/utils/module_docs_fragments/fortios.py index e1e5f8c2a42..4a371de571f 100644 --- a/lib/ansible/utils/module_docs_fragments/fortios.py +++ b/lib/ansible/utils/module_docs_fragments/fortios.py @@ -63,5 +63,5 @@ options: backup_filename: description: - Specifies the backup filename. If omitted filename will be - formated like HOST_config.YYYY-MM-DD@HH:MM:SS + formatted like HOST_config.YYYY-MM-DD@HH:MM:SS """ diff --git a/lib/ansible/utils/module_docs_fragments/tower.py b/lib/ansible/utils/module_docs_fragments/tower.py index 3a0b3ee777f..6d85df93f84 100644 --- a/lib/ansible/utils/module_docs_fragments/tower.py +++ b/lib/ansible/utils/module_docs_fragments/tower.py @@ -19,7 +19,7 @@ class ModuleDocFragment(object): - # Ansible Tower documention fragment + # Ansible Tower documentation fragment DOCUMENTATION = ''' options: tower_host: diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py index 7d9a48ce7cf..8a83f82a5fa 100644 --- a/lib/ansible/utils/vars.py +++ b/lib/ansible/utils/vars.py @@ -154,7 +154,7 @@ def load_options_vars(options, version): def isidentifier(ident): """ Determines, if string is valid Python identifier using the ast module. - Orignally posted at: http://stackoverflow.com/a/29586366 + Originally posted at: http://stackoverflow.com/a/29586366 """ if not isinstance(ident, string_types): diff --git a/test/integration/roles/cnos_backup/cnos_backup_sample_hosts b/test/integration/roles/cnos_backup/cnos_backup_sample_hosts index 0d7218705e9..3ffb1f47335 100644 --- a/test/integration/roles/cnos_backup/cnos_backup_sample_hosts +++ b/test/integration/roles/cnos_backup/cnos_backup_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_backup_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_backup_sample] diff --git a/test/integration/roles/cnos_bgp/cnos_bgp_sample_hosts b/test/integration/roles/cnos_bgp/cnos_bgp_sample_hosts index 0c27e2b1c69..1f45ac9daba 100644 --- a/test/integration/roles/cnos_bgp/cnos_bgp_sample_hosts +++ b/test/integration/roles/cnos_bgp/cnos_bgp_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_bgp_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_bgp_sample] diff --git a/test/integration/roles/cnos_command/cnos_command_sample_hosts b/test/integration/roles/cnos_command/cnos_command_sample_hosts index 238f7ef2759..9367f0fe50f 100644 --- a/test/integration/roles/cnos_command/cnos_command_sample_hosts +++ b/test/integration/roles/cnos_command/cnos_command_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_command_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_command_sample] diff --git a/test/integration/roles/cnos_conditional_command/cnos_conditional_command_sample_hosts b/test/integration/roles/cnos_conditional_command/cnos_conditional_command_sample_hosts index c8c5e02a929..87df2fc9022 100644 --- a/test/integration/roles/cnos_conditional_command/cnos_conditional_command_sample_hosts +++ b/test/integration/roles/cnos_conditional_command/cnos_conditional_command_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_conditional_command_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_conditional_command_sample] diff --git a/test/integration/roles/cnos_conditional_template/cnos_conditional_template_sample_hosts b/test/integration/roles/cnos_conditional_template/cnos_conditional_template_sample_hosts index 0c2d0da0b4f..5014c838c68 100644 --- a/test/integration/roles/cnos_conditional_template/cnos_conditional_template_sample_hosts +++ b/test/integration/roles/cnos_conditional_template/cnos_conditional_template_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_conditional_template_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_conditional_template_sample] diff --git a/test/integration/roles/cnos_ethernet/cnos_ethernet_sample_hosts b/test/integration/roles/cnos_ethernet/cnos_ethernet_sample_hosts index 78f9debcb60..bf315d12e36 100644 --- a/test/integration/roles/cnos_ethernet/cnos_ethernet_sample_hosts +++ b/test/integration/roles/cnos_ethernet/cnos_ethernet_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_ethernet_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_ethernet_sample] diff --git a/test/integration/roles/cnos_facts/cnos_facts_sample_hosts b/test/integration/roles/cnos_facts/cnos_facts_sample_hosts index 00e31146429..50d86ecbb7e 100644 --- a/test/integration/roles/cnos_facts/cnos_facts_sample_hosts +++ b/test/integration/roles/cnos_facts/cnos_facts_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_facts_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_facts_sample] diff --git a/test/integration/roles/cnos_image/cnos_image_sample_hosts b/test/integration/roles/cnos_image/cnos_image_sample_hosts index b1918284c85..0b1fd345674 100644 --- a/test/integration/roles/cnos_image/cnos_image_sample_hosts +++ b/test/integration/roles/cnos_image/cnos_image_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_image_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_image_sample] diff --git a/test/integration/roles/cnos_portchannel/cnos_portchannel_sample_hosts b/test/integration/roles/cnos_portchannel/cnos_portchannel_sample_hosts index 1267e938b2a..1fc68a9228f 100644 --- a/test/integration/roles/cnos_portchannel/cnos_portchannel_sample_hosts +++ b/test/integration/roles/cnos_portchannel/cnos_portchannel_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_portchannel_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_portchannel_sample] diff --git a/test/integration/roles/cnos_rollback/cnos_rollback_sample_hosts b/test/integration/roles/cnos_rollback/cnos_rollback_sample_hosts index 61204568abb..1e3e7e37c0f 100644 --- a/test/integration/roles/cnos_rollback/cnos_rollback_sample_hosts +++ b/test/integration/roles/cnos_rollback/cnos_rollback_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_rollback_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_rollback_sample] diff --git a/test/integration/roles/cnos_save/cnos_save_sample_hosts b/test/integration/roles/cnos_save/cnos_save_sample_hosts index cc207735b76..0f34cf17fa9 100644 --- a/test/integration/roles/cnos_save/cnos_save_sample_hosts +++ b/test/integration/roles/cnos_save/cnos_save_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_save_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_save_sample] diff --git a/test/integration/roles/cnos_showrun/cnos_showrun_sample_hosts b/test/integration/roles/cnos_showrun/cnos_showrun_sample_hosts index 64936a54363..6c90bab8fd0 100644 --- a/test/integration/roles/cnos_showrun/cnos_showrun_sample_hosts +++ b/test/integration/roles/cnos_showrun/cnos_showrun_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_facts_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_showrun_sample] diff --git a/test/integration/roles/cnos_template/cnos_template_sample_hosts b/test/integration/roles/cnos_template/cnos_template_sample_hosts index 92e42309c44..8e84f5ec2ec 100644 --- a/test/integration/roles/cnos_template/cnos_template_sample_hosts +++ b/test/integration/roles/cnos_template/cnos_template_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_template_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_template_sample] diff --git a/test/integration/roles/cnos_vlag/cnos_vlag_sample_hosts b/test/integration/roles/cnos_vlag/cnos_vlag_sample_hosts index 1404e384ab0..7ccf4dd47f6 100644 --- a/test/integration/roles/cnos_vlag/cnos_vlag_sample_hosts +++ b/test/integration/roles/cnos_vlag/cnos_vlag_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_vlag_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_vlag_sample] diff --git a/test/integration/roles/cnos_vlan/cnos_vlan_sample_hosts b/test/integration/roles/cnos_vlan/cnos_vlan_sample_hosts index 9d822245615..cbb3c31e641 100644 --- a/test/integration/roles/cnos_vlan/cnos_vlan_sample_hosts +++ b/test/integration/roles/cnos_vlan/cnos_vlan_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_vlan_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_vlan_sample] diff --git a/test/integration/roles/test_consul_service/tasks/main.yml b/test/integration/roles/test_consul_service/tasks/main.yml index 1b6643f59cb..630d2a669f0 100644 --- a/test/integration/roles/test_consul_service/tasks/main.yml +++ b/test/integration/roles/test_consul_service/tasks/main.yml @@ -141,7 +141,7 @@ that: - delete_service_result.changed -- name: removal of an non-existant service causes no change +- name: removal of an non-existent service causes no change consul: service_id: 'service1' state: absent @@ -163,7 +163,7 @@ that: - delete_check_result.changed -- name: removal of an non-existant check causes no change +- name: removal of an non-existent check causes no change consul: check_id: 'node_level' state: absent diff --git a/test/integration/roles/test_gce_tag/tasks/test.yml b/test/integration/roles/test_gce_tag/tasks/test.yml index 4d475c07e72..09b6a73167b 100644 --- a/test/integration/roles/test_gce_tag/tasks/test.yml +++ b/test/integration/roles/test_gce_tag/tasks/test.yml @@ -59,9 +59,9 @@ - 'result.failed' - 'result.msg == "Regex error for pattern &23424--[: unexpected end of regular expression"' -## Non-existant instance tests ## +## Non-existent instance tests ## # # ============================================================ -- name: "test tag non-existant instance (state==present)" +- name: "test tag non-existent instance (state==present)" gce_tag: service_account_email: "{{ service_account_email }}" pem_file: "{{ pem_file }}" @@ -79,7 +79,7 @@ - 'result.failed' # # ============================================================ -- name: "test tag non-existant instance (state==absent)" +- name: "test tag non-existent instance (state==absent)" gce_tag: service_account_email: "{{ service_account_email }}" pem_file: "{{ pem_file }}" diff --git a/test/integration/roles/test_jenkins_job/tasks/main.yml b/test/integration/roles/test_jenkins_job/tasks/main.yml index a21346cb467..ce032228d54 100644 --- a/test/integration/roles/test_jenkins_job/tasks/main.yml +++ b/test/integration/roles/test_jenkins_job/tasks/main.yml @@ -94,7 +94,7 @@ - result|changed - result.enabled -- name: test disable an exising job without config +- name: test disable an existing job without config local_action: module: jenkins_job name: test.job @@ -103,14 +103,14 @@ password: "{{ jenkins_password }}" enabled: false register: result -- name: verify test disable an exising job without config +- name: verify test disable an existing job without config assert: that: - result|success - result|changed - not result.enabled -- name: test disable an exising job without config idempotence +- name: test disable an existing job without config idempotence local_action: module: jenkins_job name: test.job @@ -119,7 +119,7 @@ password: "{{ jenkins_password }}" enabled: false register: result -- name: verify test disable an exising job without config idempotence +- name: verify test disable an existing job without config idempotence assert: that: - result|success diff --git a/test/integration/targets/parsing/cnos_vlan/cnos_vlan_sample_hosts b/test/integration/targets/parsing/cnos_vlan/cnos_vlan_sample_hosts index 9d822245615..cbb3c31e641 100644 --- a/test/integration/targets/parsing/cnos_vlan/cnos_vlan_sample_hosts +++ b/test/integration/targets/parsing/cnos_vlan/cnos_vlan_sample_hosts @@ -7,7 +7,7 @@ # - A hostname/ip can be a member of multiple groups # # In the /etc/ansible/hosts file u have to enter [cnos_vlan_sample] tag -# Following you should specify IP Adresses details +# Following you should specify IP Addresses details # Please change and with appropriate value for your switch. [cnos_vlan_sample] diff --git a/test/integration/targets/win_async_wrapper/tasks/main.yml b/test/integration/targets/win_async_wrapper/tasks/main.yml index da53d870446..382591750dd 100644 --- a/test/integration/targets/win_async_wrapper/tasks/main.yml +++ b/test/integration/targets/win_async_wrapper/tasks/main.yml @@ -141,7 +141,7 @@ - asyncresult.finished == 1 - asyncresult.changed == false - asyncresult | failed == true -# TODO: reenable after catastrophic failure behavior is cleaned up +# TODO: re-enable after catastrophic failure behavior is cleaned up # - asyncresult.msg is search('failing via exception') diff --git a/test/integration/targets/win_find/tasks/main.yml b/test/integration/targets/win_find/tasks/main.yml index 9d85310bc52..f6ef8576968 100644 --- a/test/integration/targets/win_find/tasks/main.yml +++ b/test/integration/targets/win_find/tasks/main.yml @@ -139,7 +139,7 @@ register: actual failed_when: actual.msg != 'Argument path ' + win_output_dir + '\\win_find\\single\\large.ps1 is a file not a directory' -- name: expect failure whe path is set to a non existant folder +- name: expect failure whe path is set to a non existent folder win_find: paths: "{{win_output_dir}}\\win_find\\thisisafakefolder" register: actual diff --git a/test/integration/targets/win_reg_stat/tasks/main.yml b/test/integration/targets/win_reg_stat/tasks/main.yml index 6793e75976f..ebaa37d2339 100644 --- a/test/integration/targets/win_reg_stat/tasks/main.yml +++ b/test/integration/targets/win_reg_stat/tasks/main.yml @@ -113,12 +113,12 @@ that: - "actual == expected" -- name: get non-existant reg key +- name: get non-existent reg key win_reg_stat: path: HKCU:\Test\Thispathwillneverexist register: actual -- name: set expected value for non-existant reg key +- name: set expected value for non-existent reg key set_fact: expected: changed: false @@ -298,13 +298,13 @@ that: - "actual == expected" -- name: get non-existance property +- name: get non-existence property win_reg_stat: path: HKCU:\Test\single name: doesnotexist register: actual -- name: set expected non-existance property +- name: set expected non-existence property set_fact: expected: changed: false diff --git a/test/integration/targets/win_service/tasks/main.yml b/test/integration/targets/win_service/tasks/main.yml index 57a4ae06188..62a66aa6949 100644 --- a/test/integration/targets/win_service/tasks/main.yml +++ b/test/integration/targets/win_service/tasks/main.yml @@ -497,7 +497,7 @@ desktop_interact: True register: win_service_local_system_desktop -- name: check that the service has been set to Local Sytem with desktop interaction +- name: check that the service has been set to Local System with desktop interaction assert: that: - "win_service_local_system_desktop|changed" @@ -791,7 +791,7 @@ name: TestServiceDependency state: started -- name: wait 5 seconds for service to propogate service startup +- name: wait 5 seconds for service to propagate service startup pause: seconds: 5 diff --git a/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 b/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 index f5d5880cdde..12a63444a94 100644 --- a/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 +++ b/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 @@ -21,7 +21,7 @@ galaxy_info: # Optionally specify the branch Galaxy will use when accessing the GitHub # repo for this role. During role install, if no tags are available, # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If travis integration is cofigured, only notification for this + # this branch. If travis integration is configured, only notification for this # branch will be accepted. Otherwise, in all cases, the repo's default branch # (usually master) will be used. #github_branch: diff --git a/test/units/module_utils/gcp/test_auth.py b/test/units/module_utils/gcp/test_auth.py index 1d3685249dd..b026b69cdee 100644 --- a/test/units/module_utils/gcp/test_auth.py +++ b/test/units/module_utils/gcp/test_auth.py @@ -152,7 +152,7 @@ class GCPAuthTestCase(unittest.TestCase): module = mock.MagicMock() with mock.patch("ansible.module_utils.gcp.open", mock.mock_open(read_data='foobar'), create=True) as m: - # pem condition, warning is surpressed with the return_value + # pem condition, warning is suppressed with the return_value credentials_file = '/foopath/pem.pem' is_valid = _validate_credentials_file(module, credentials_file=credentials_file, diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index 46f5f8f233d..ed609df4fba 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -173,7 +173,7 @@ class TestVaultEditor(unittest.TestCase): src_file_contents = to_bytes("some info in a file\nyup.") src_file_path = self._create_file(self._test_dir, 'src_file', content=src_file_contents) - # editor invocation doesnt change anything + # editor invocation doesn't change anything def faux_editor(editor_args): self._faux_editor(editor_args, src_file_contents) diff --git a/test/units/parsing/yaml/test_loader.py b/test/units/parsing/yaml/test_loader.py index 84e6da2d6ad..e78bce1ed57 100644 --- a/test/units/parsing/yaml/test_loader.py +++ b/test/units/parsing/yaml/test_loader.py @@ -286,7 +286,7 @@ class TestAnsibleLoaderVault(unittest.TestCase, YamlTestUtils): self.assertTrue('some string' != vault_string) self.assertNotEquals('some string', vault_string) - # Note this is a compare of the str/unicode of these, they are diferent types + # Note this is a compare of the str/unicode of these, they are different types # so we want to test self == other, and other == self etc self.assertEquals(plaintext_var, vault_string) self.assertEquals(vault_string, plaintext_var) diff --git a/test/units/playbook/role/test_include_role.py b/test/units/playbook/role/test_include_role.py index dbf6ba32b6e..30d79d6f469 100644 --- a/test/units/playbook/role/test_include_role.py +++ b/test/units/playbook/role/test_include_role.py @@ -151,7 +151,7 @@ class TestIncludeRole(unittest.TestCase): """ Test nested includes with default tasks and variables. - Variables from outer roles should be inherited, but overriden in inner + Variables from outer roles should be inherited, but overridden in inner roles. """ @@ -192,7 +192,7 @@ class TestIncludeRole(unittest.TestCase): """ Test nested includes with alternative tasks and variables. - Variables from outer roles should be inherited, but overriden in inner + Variables from outer roles should be inherited, but overridden in inner roles. """ diff --git a/test/units/plugins/action/test_synchronize.py b/test/units/plugins/action/test_synchronize.py index 7eb0e40a672..53d73c500ce 100644 --- a/test/units/plugins/action/test_synchronize.py +++ b/test/units/plugins/action/test_synchronize.py @@ -114,7 +114,7 @@ class SynchronizeTester(object): fdata = f.read() test_meta = yaml.load(fdata) - # load inital play context vars + # load initial play context vars if '_play_context' in test_meta: if test_meta['_play_context']: self.task.args = {} @@ -123,7 +123,7 @@ class SynchronizeTester(object): v = None setattr(self._play_context, k, v) - # load inital task context vars + # load initial task context vars if '_task' in test_meta: if test_meta['_task']: self.task.args = {} @@ -133,14 +133,14 @@ class SynchronizeTester(object): v = None setattr(self.task, k, v) - # load inital task vars + # load initial task vars if 'task_args' in test_meta: if test_meta['task_args']: self.task.args = {} for (k, v) in test_meta['task_args'].items(): self.task.args[k] = v - # load inital task vars + # load initial task vars invarspath = os.path.join(fixturepath, test_meta.get('fixtures', {}).get('taskvars_in', 'taskvars_in.json')) with open(invarspath, 'rb') as f: fdata = f.read() @@ -163,7 +163,7 @@ class SynchronizeTester(object): for (k, v) in test_meta['hostvars'].items(): in_task_vars['hostvars'][k] = v - # initalize and run the module + # initialize and run the module SAM = ActionModule(self.task, self.connection, self._play_context, self.loader, self.templar, self.shared_loader_obj) SAM._execute_module = self._execute_module diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index 5268a00ceac..c32bbc88503 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -206,7 +206,7 @@ class TestVariableManager(unittest.TestCase): res = v.get_vars(play=play1, task=task) self.assertEqual(res['default_var'], 'default_var_from_defaults_only1') - # next we assert the precendence of inventory variables + # next we assert the precedence of inventory variables v.set_inventory(inv1) h1 = inv1.get_host('host1')