From 0b8011436dc7f842b78298848e298f2a57ee8d78 Mon Sep 17 00:00:00 2001 From: "Carlos E. Garcia" Date: Sat, 10 Dec 2016 21:50:09 -0500 Subject: [PATCH] minor spelling changes --- CHANGELOG.md | 2 +- contrib/inventory/ec2.ini | 2 +- contrib/inventory/ec2.py | 4 ++-- contrib/inventory/gce.py | 2 +- contrib/inventory/rudder.ini | 4 ++-- contrib/inventory/vmware_inventory.py | 2 +- docs/man/man1/ansible-pull.1.asciidoc.in | 2 +- docsite/_static/searchtools.js | 2 +- docsite/rst/become.rst | 2 +- docsite/rst/committer_guidelines.rst | 2 +- .../rst/dev_guide/developing_module_utilities.rst | 10 +++++----- docsite/rst/dev_guide/developing_modules.rst | 2 +- docsite/rst/dev_guide/developing_modules_python3.rst | 2 +- docsite/rst/dev_guide/developing_plugins.rst | 4 ++-- docsite/rst/developing_modules.rst | 2 +- docsite/rst/guide_cloudstack.rst | 4 ++-- docsite/rst/intro_installation.rst | 2 +- docsite/rst/intro_patterns.rst | 2 +- docsite/rst/intro_windows.rst | 2 +- examples/ansible.cfg | 2 +- lib/ansible/cli/galaxy.py | 4 ++-- lib/ansible/constants.py | 2 +- lib/ansible/executor/task_executor.py | 2 +- lib/ansible/executor/task_result.py | 2 +- lib/ansible/inventory/script.py | 2 +- lib/ansible/module_utils/facts.py | 2 +- lib/ansible/modules/cloud/amazon/ec2_eip.py | 2 +- .../modules/cloud/amazon/ec2_scaling_policy.py | 2 +- lib/ansible/modules/cloud/amazon/ec2_vol.py | 2 +- .../modules/cloud/amazon/ec2_vpc_nat_gateway.py | 2 +- lib/ansible/modules/cloud/azure/azure_rm_subnet.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_cluster.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_instance.py | 4 ++-- .../modules/cloud/cloudstack/cs_loadbalancer_rule.py | 2 +- lib/ansible/modules/cloud/lxd/lxd_container.py | 2 +- lib/ansible/modules/cloud/misc/proxmox_kvm.py | 2 +- lib/ansible/modules/cloud/misc/rhevm.py | 2 +- lib/ansible/modules/cloud/openstack/README.md | 4 ++-- .../modules/cloud/openstack/_keystone_user.py | 2 +- .../modules/cloud/openstack/os_ironic_inspect.py | 2 +- lib/ansible/modules/cloud/openstack/os_user_role.py | 2 +- .../cloud/ovh/ovh_ip_loadbalancing_backend.py | 2 +- lib/ansible/modules/cloud/ovirt/ovirt_vms.py | 2 +- .../modules/cloud/profitbricks/profitbricks.py | 4 ++-- .../cloud/profitbricks/profitbricks_datacenter.py | 4 ++-- .../modules/cloud/profitbricks/profitbricks_nic.py | 4 ++-- .../cloud/profitbricks/profitbricks_volume.py | 4 ++-- .../profitbricks/profitbricks_volume_attachments.py | 4 ++-- lib/ansible/modules/cloud/softlayer/sl_vm.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_guest.py | 2 +- lib/ansible/modules/cloud/vmware/vmware_vm_shell.py | 2 +- lib/ansible/modules/clustering/consul.py | 2 +- lib/ansible/modules/clustering/consul_acl.py | 4 ++-- lib/ansible/modules/database/misc/mongodb_user.py | 2 +- lib/ansible/modules/files/blockinfile.py | 2 +- lib/ansible/modules/files/patch.py | 2 +- lib/ansible/modules/identity/ipa/ipa_host.py | 2 +- lib/ansible/modules/monitoring/logentries.py | 2 +- lib/ansible/modules/monitoring/logicmonitor.py | 4 ++-- lib/ansible/modules/monitoring/zabbix_maintenance.py | 6 +++--- lib/ansible/modules/network/asa/asa_acl.py | 2 +- lib/ansible/modules/network/f5/bigip_device_ntp.py | 2 +- lib/ansible/modules/network/f5/bigip_device_sshd.py | 2 +- .../modules/network/f5/bigip_gtm_datacenter.py | 2 +- lib/ansible/modules/network/f5/bigip_pool_member.py | 2 +- lib/ansible/modules/network/f5/bigip_selfip.py | 2 +- lib/ansible/modules/network/netvisor/pn_trunk.py | 4 ++-- lib/ansible/modules/network/snmp_facts.py | 4 ++-- lib/ansible/modules/network/sros/sros_rollback.py | 2 +- lib/ansible/modules/network/wakeonlan.py | 2 +- lib/ansible/modules/notification/slack.py | 2 +- lib/ansible/modules/packaging/language/composer.py | 2 +- lib/ansible/modules/packaging/language/pear.py | 2 +- lib/ansible/modules/packaging/os/apt_rpm.py | 2 +- lib/ansible/modules/packaging/os/macports.py | 2 +- lib/ansible/modules/packaging/os/openbsd_pkg.py | 2 +- lib/ansible/modules/packaging/os/opkg.py | 2 +- lib/ansible/modules/packaging/os/pacman.py | 2 +- lib/ansible/modules/packaging/os/pkgin.py | 2 +- lib/ansible/modules/packaging/os/pkgng.py | 2 +- lib/ansible/modules/packaging/os/portinstall.py | 4 ++-- lib/ansible/modules/packaging/os/slackpkg.py | 2 +- lib/ansible/modules/packaging/os/swdepot.py | 4 ++-- lib/ansible/modules/packaging/os/urpmi.py | 2 +- lib/ansible/modules/packaging/os/xbps.py | 2 +- lib/ansible/modules/system/open_iscsi.py | 2 +- lib/ansible/modules/system/svc.py | 2 +- .../modules/web_infrastructure/ejabberd_user.py | 2 +- .../modules/web_infrastructure/jenkins_plugin.py | 2 +- .../modules/web_infrastructure/letsencrypt.py | 12 ++++++------ lib/ansible/modules/windows/win_acl.ps1 | 6 +++--- lib/ansible/modules/windows/win_acl_inheritance.ps1 | 2 +- lib/ansible/modules/windows/win_firewall_rule.py | 2 +- lib/ansible/modules/windows/win_iis_webapppool.py | 2 +- lib/ansible/modules/windows/win_iis_webbinding.ps1 | 2 +- lib/ansible/modules/windows/win_iis_website.ps1 | 2 +- lib/ansible/modules/windows/win_iis_website.py | 2 +- lib/ansible/modules/windows/win_lineinfile.ps1 | 2 +- lib/ansible/modules/windows/win_owner.ps1 | 2 +- lib/ansible/modules/windows/win_package.ps1 | 4 ++-- lib/ansible/modules/windows/win_robocopy.py | 2 +- lib/ansible/modules/windows/win_share.ps1 | 4 ++-- lib/ansible/modules/windows/win_timezone.ps1 | 10 +++++----- lib/ansible/parsing/vault/__init__.py | 2 +- lib/ansible/playbook/play_context.py | 2 +- lib/ansible/playbook/task.py | 2 +- lib/ansible/plugins/action/__init__.py | 2 +- lib/ansible/plugins/callback/foreman.py | 2 +- lib/ansible/plugins/strategy/__init__.py | 2 +- lib/ansible/utils/module_docs_fragments/ovirt.py | 2 +- .../utils/module_docs_fragments/ovirt_facts.py | 4 ++-- test/integration/targets/postgresql/tasks/main.yml | 2 +- test/integration/targets/template/tasks/main.yml | 2 +- test/integration/targets/win_regmerge/tasks/main.yml | 2 +- 114 files changed, 152 insertions(+), 152 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b14552b34d..053a799ac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1782,7 +1782,7 @@ New modules and plugins. * rax_clb *-- manages Rackspace cloud load balancers* - files * acl *-- set or get acls on a file* - * synchronize *-- a useful wraper around rsyncing trees of files* + * synchronize *-- a useful wrapper around rsyncing trees of files* * unarchive *-- pushes and extracts tarballs* - system * blacklist *-- add or remove modules from the kernel blacklist* diff --git a/contrib/inventory/ec2.ini b/contrib/inventory/ec2.ini index 9ae2ecea44..a7d043f1dc 100644 --- a/contrib/inventory/ec2.ini +++ b/contrib/inventory/ec2.ini @@ -75,7 +75,7 @@ all_instances = False # By default, only EC2 instances in the 'running' state are returned. Specify # EC2 instance states to return as a comma-separated list. This -# option is overriden when 'all_instances' is True. +# option is overridden when 'all_instances' is True. # instance_states = pending, running, shutting-down, terminated, stopping, stopped # By default, only RDS instances in the 'available' state are returned. Set diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py index dcc369e124..84bc22f2e1 100755 --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -676,7 +676,7 @@ class Ec2Inventory(object): try: # Boto also doesn't provide wrapper classes to CacheClusters or - # CacheNodes. Because of that wo can't make use of the get_list + # CacheNodes. Because of that we can't make use of the get_list # method in the AWSQueryConnection. Let's do the work manually clusters = response['DescribeCacheClustersResponse']['DescribeCacheClustersResult']['CacheClusters'] @@ -710,7 +710,7 @@ class Ec2Inventory(object): try: # Boto also doesn't provide wrapper classes to ReplicationGroups - # Because of that wo can't make use of the get_list method in the + # Because of that we can't make use of the get_list method in the # AWSQueryConnection. Let's do the work manually replication_groups = response['DescribeReplicationGroupsResponse']['DescribeReplicationGroupsResult']['ReplicationGroups'] diff --git a/contrib/inventory/gce.py b/contrib/inventory/gce.py index 87f1e8e811..3c5424fdb9 100755 --- a/contrib/inventory/gce.py +++ b/contrib/inventory/gce.py @@ -312,7 +312,7 @@ class GceInventory(object): return gce def parse_env_zones(self): - '''returns a list of comma seperated zones parsed from the GCE_ZONE environment variable. + '''returns a list of comma separated zones parsed from the GCE_ZONE environment variable. If provided, this will be used to filter the results of the grouped_instances call''' import csv reader = csv.reader([os.environ.get('GCE_ZONE',"")], skipinitialspace=True) diff --git a/contrib/inventory/rudder.ini b/contrib/inventory/rudder.ini index 376674bb90..748b3d2121 100644 --- a/contrib/inventory/rudder.ini +++ b/contrib/inventory/rudder.ini @@ -14,7 +14,7 @@ disable_ssl_certificate_validation = True # Your Rudder API token, created in the Web interface. token = aaabbbccc -# Rudder API version to use, use "latest" for lastest available +# Rudder API version to use, use "latest" for latest available # version. version = latest @@ -23,7 +23,7 @@ version = latest group_name = displayName # Fail if there are two groups with the same name or two hosts with the -# same hostname in the output. +# same hostname in the output. fail_if_name_collision = True # We cache the results of Rudder API in a local file diff --git a/contrib/inventory/vmware_inventory.py b/contrib/inventory/vmware_inventory.py index f513322263..e65226c42f 100755 --- a/contrib/inventory/vmware_inventory.py +++ b/contrib/inventory/vmware_inventory.py @@ -5,7 +5,7 @@ # TODO: # * more jq examples -# * optional folder heirarchy +# * optional folder heriarchy """ $ jq '._meta.hostvars[].config' data.json | head diff --git a/docs/man/man1/ansible-pull.1.asciidoc.in b/docs/man/man1/ansible-pull.1.asciidoc.in index d2211553be..84e46aaddd 100644 --- a/docs/man/man1/ansible-pull.1.asciidoc.in +++ b/docs/man/man1/ansible-pull.1.asciidoc.in @@ -131,7 +131,7 @@ Purge the checkout after the playbook is run. *-s* 'SLEEP', *--sleep=*'SLEEP':: -Sleep for random interval (between 0 and SLEEP number of seconds) before starting. This is a useful way ot disperse git requests. +Sleep for random interval (between 0 and SLEEP number of seconds) before starting. This is a useful way to disperse git requests. *--ssh-common-args=*''-o ProxyCommand="ssh -W %h:%p ..." ...'':: diff --git a/docsite/_static/searchtools.js b/docsite/_static/searchtools.js index 945b7a93e6..fde90778c6 100644 --- a/docsite/_static/searchtools.js +++ b/docsite/_static/searchtools.js @@ -2,7 +2,7 @@ * searchtools.js_t * ~~~~~~~~~~~~~~~~ * - * Sphinx JavaScript utilties for the full-text search. + * Sphinx JavaScript utilities for the full-text search. * * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. diff --git a/docsite/rst/become.rst b/docsite/rst/become.rst index e42db0bc94..be00e32e61 100644 --- a/docsite/rst/become.rst +++ b/docsite/rst/become.rst @@ -20,7 +20,7 @@ privilege escalation tools, which you probably already use or have configured, l Directives ----------- -These can be set from play to task level, but are overriden by connection variables as they can be host specific. +These can be set from play to task level, but are overridden by connection variables as they can be host specific. become set to 'true'/'yes' to activate privilege escalation. diff --git a/docsite/rst/committer_guidelines.rst b/docsite/rst/committer_guidelines.rst index 3b841b8828..014ae02397 100644 --- a/docsite/rst/committer_guidelines.rst +++ b/docsite/rst/committer_guidelines.rst @@ -57,7 +57,7 @@ Individuals with direct commit access to ansible/ansible (+core, + extras) are e - Be active. Committers who have no activity on the project (through merges, triage, commits, etc.) will have their permissions suspended. - Consider backwards compatibility (goes back to "don’t break existing playbooks"). - Write tests. PRs with tests are looked at with more priority than PRs without tests that should have them included. While not all changes require tests, be sure to add them for bug fixes or functionality changes. - - Discuss with other commiters, specially when you are unsure of something. + - Discuss with other committers, specially when you are unsure of something. - Document! If your PR is a new feature or a change to behavior, make sure you've updated all associated documentation or have notified the right people to do so. It also helps to add the version of Core against which this documentation is compatible (to avoid confusion with stable versus devel docs, for backwards compatibility, etc.). - Consider scope, sometimes a fix can be generalized - Keep it simple, then things are maintainable, debuggable and intelligible. diff --git a/docsite/rst/dev_guide/developing_module_utilities.rst b/docsite/rst/dev_guide/developing_module_utilities.rst index 16a089131b..40e78afa8a 100644 --- a/docsite/rst/dev_guide/developing_module_utilities.rst +++ b/docsite/rst/dev_guide/developing_module_utilities.rst @@ -12,11 +12,11 @@ The following is a list of module_utils files and a general description. The mod - api.py - Adds shared support for generic API modules. - asa.py - Module support utilities for managing Cisco ASA network devices. - azure_rm_common.py - Definitions and utilities for Microsoft Azure Resource Manager template deployments. -- basic.py - General definitions and helper utilites for Ansible modules. +- basic.py - General definitions and helper utilities for Ansible modules. - cloudstack.py - Utilities for CloudStack modules. - database.py - Miscellaneous helper functions for PostGRES and MySQL -- docker_common.py - Definitions and helper utilites for modules working with Docker. -- ec2.py - Definitions and utilites for modules working with Amazon EC2 +- docker_common.py - Definitions and helper utilities for modules working with Docker. +- ec2.py - Definitions and utilities for modules working with Amazon EC2 - eos.py - Helper functions for modules working with EOS networking devices. - f5.py - Helper functions for modules working with F5 networking devices. - facts.py - Helper functions for modules that return facts. @@ -25,7 +25,7 @@ The following is a list of module_utils files and a general description. The mod - iosxr.py - Definitions and helper functions for modules that manage Cisco IOS-XR networking devices - ismount.py - Contains single helper function that fixes os.path.ismount - junos.py - Definitions and helper functions for modules that manage Junos networking devices -- known_hosts.py - Utilites for working with known_hosts file +- known_hosts.py - utilities for working with known_hosts file - mysql.py - Allows modules to connect to a MySQL instance - netcfg.py - Configuration utility functions for use by networking modules - netcmd.py - Defines commands and comparison operators for use in networking modules @@ -40,7 +40,7 @@ The following is a list of module_utils files and a general description. The mod - service.py - Contains utilities to enable modules to work with Linux services (placeholder, not in use). - shell.py - Functions to allow modules to create shells and work with shell commands - six.py - Module utils for working with the Six python 2 and 3 compatibility library -- splitter.py - String splitting and manipulation utilites for working with Jinja2 templates +- splitter.py - String splitting and manipulation utilities for working with Jinja2 templates - urls.py - Utilities for working with http and https requests - vca.py - Contains utilities for modules that work with VMware vCloud Air - vmware.py - Contains utilities for modules that work with VMware vSphere VMs diff --git a/docsite/rst/dev_guide/developing_modules.rst b/docsite/rst/dev_guide/developing_modules.rst index e24166c2f6..0522514f92 100644 --- a/docsite/rst/dev_guide/developing_modules.rst +++ b/docsite/rst/dev_guide/developing_modules.rst @@ -763,7 +763,7 @@ Windows modules checklist * Look at existing modules for more examples of argument checking. * Results - * The result object should allways contain an attribute called changed set to either $true or $false + * The result object should always contain an attribute called changed set to either $true or $false * Create your result object like this:: $result = New-Object psobject @{ diff --git a/docsite/rst/dev_guide/developing_modules_python3.rst b/docsite/rst/dev_guide/developing_modules_python3.rst index 8fdf9f1b80..7022aab55d 100644 --- a/docsite/rst/dev_guide/developing_modules_python3.rst +++ b/docsite/rst/dev_guide/developing_modules_python3.rst @@ -71,7 +71,7 @@ numbers, other printable symbols, and a small number of unprintable "symbols" (control codes). In Python-2, the two types for these (:class:`str` for bytes and -:class:`unicode` for text) are often used interchangably. When dealing only +:class:`unicode` for text) are often used interchangeably. When dealing only with ASCII characters, the strings can be combined, compared, and converted from one type to another automatically. When non-ASCII characters are introduced, Python starts throwing exceptions due to not knowing what encoding diff --git a/docsite/rst/dev_guide/developing_plugins.rst b/docsite/rst/dev_guide/developing_plugins.rst index af8cde195d..d2cf235a94 100644 --- a/docsite/rst/dev_guide/developing_plugins.rst +++ b/docsite/rst/dev_guide/developing_plugins.rst @@ -125,7 +125,7 @@ The following example shows how Ansible's timer plugin is implemented:: runtime = end_time - self.start_time self._display.display("Playbook run took %s days, %s hours, %s minutes, %s seconds" % (self.days_hours_minutes_seconds(runtime))) -Note that the CALLBACK_VERSION and CALLBACK_NAME definitons are required for properly functioning plugins for Ansible >=2.0. +Note that the CALLBACK_VERSION and CALLBACK_NAME definitions are required for properly functioning plugins for Ansible >=2.0. .. _developing_connection_plugins: @@ -193,7 +193,7 @@ An example of how this lookup is called:: - debug: msg="the value of foo.txt is {{ contents }} as seen today {{ lookup('pipe', 'date +"%Y-%m-%d"') }}" -Errors encountered during execution should be returned by raising AnsibleError() with a message describing the error. Any strings returned by your lookup plugin implementation that could ever contain non-ASCII characters must be converted into Python's unicode type becasue the strings will be run through jinja2. To do this, you can use:: +Errors encountered during execution should be returned by raising AnsibleError() with a message describing the error. Any strings returned by your lookup plugin implementation that could ever contain non-ASCII characters must be converted into Python's unicode type because the strings will be run through jinja2. To do this, you can use:: from ansible.module_utils._text import to_text result_string = to_text(result_string) diff --git a/docsite/rst/developing_modules.rst b/docsite/rst/developing_modules.rst index 492bb9a829..1c86f34374 100644 --- a/docsite/rst/developing_modules.rst +++ b/docsite/rst/developing_modules.rst @@ -778,7 +778,7 @@ Windows modules checklist * Look at existing modules for more examples of argument checking. * Results - * The result object should allways contain an attribute called changed set to either $true or $false + * The result object should always contain an attribute called changed set to either $true or $false * Create your result object like this:: $result = New-Object psobject @{ diff --git a/docsite/rst/guide_cloudstack.rst b/docsite/rst/guide_cloudstack.rst index a3b37ae987..d82159b2d8 100644 --- a/docsite/rst/guide_cloudstack.rst +++ b/docsite/rst/guide_cloudstack.rst @@ -164,7 +164,7 @@ This is how our inventory looks like: As you can see, the public IPs for our web servers and jumphost has been assigned as variable ``public_ip`` directly in the inventory. -The configure the jumphost, web servers and database servers, we use ``group_vars``. The ``group_vars`` directory contains 4 files for configuration of the groups: cloud-vm, jumphost, webserver and db-server. The cloud-vm is there for specifing the defaults of our cloud infrastructure. +The configure the jumphost, web servers and database servers, we use ``group_vars``. The ``group_vars`` directory contains 4 files for configuration of the groups: cloud-vm, jumphost, webserver and db-server. The cloud-vm is there for specifying the defaults of our cloud infrastructure. .. code-block:: yaml @@ -231,7 +231,7 @@ Now to the fun part. We create a playbook to create our infrastructure we call i In the above play we defined 3 tasks and use the group ``cloud-vm`` as target to handle all VMs in the cloud but instead SSH to these VMs, we use ``connetion=local`` to execute the API calls locally from our workstation. -In the first task, we ensure we have a running VM created with the Debian template. If the VM is already created but stopped, it would just start it. If you like to change the offering on an exisiting VM, you must add ``force: yes`` to the task, which would stop the VM, change the offering and start the VM again. +In the first task, we ensure we have a running VM created with the Debian template. If the VM is already created but stopped, it would just start it. If you like to change the offering on an existing VM, you must add ``force: yes`` to the task, which would stop the VM, change the offering and start the VM again. In the second task we ensure the ports are opened if we give a public IP to the VM. diff --git a/docsite/rst/intro_installation.rst b/docsite/rst/intro_installation.rst index 586830fb46..718cce0a5d 100644 --- a/docsite/rst/intro_installation.rst +++ b/docsite/rst/intro_installation.rst @@ -90,7 +90,7 @@ You also need Python 2.4 or later. If you are running less than Python 2.5 on th Ansible 2.2 introduces a tech preview of support for Python 3. For more information, see `Python 3 Support `_. - By default, Ansible uses Python 2 in order to maintain compability with older distributions + By default, Ansible uses Python 2 in order to maintain compatibility with older distributions such as RHEL 5 and RHEL 6. However, some Linux distributions (Gentoo, Arch) may not have a Python 2.X interpreter installed by default. On those systems, you should install one, and set the 'ansible_python_interpreter' variable in inventory (see :doc:`intro_inventory`) to point at your 2.X Python. Distributions diff --git a/docsite/rst/intro_patterns.rst b/docsite/rst/intro_patterns.rst index dfb5ca2b66..3141173172 100644 --- a/docsite/rst/intro_patterns.rst +++ b/docsite/rst/intro_patterns.rst @@ -97,7 +97,7 @@ And if you want to read the list of hosts from a file, prefix the file name with Easy enough. See :doc:`intro_adhoc` and then :doc:`playbooks` for how to apply this knowledge. -.. note:: With the exception of version 1.9, you can use ',' instead of ':' as a host list separator. The ',' is prefered specially when dealing with ranges and ipv6. +.. note:: With the exception of version 1.9, you can use ',' instead of ':' as a host list separator. The ',' is preferred specially when dealing with ranges and ipv6. .. note:: As of 2.0 the ';' is deprecated as a host list separator. .. seealso:: diff --git a/docsite/rst/intro_windows.rst b/docsite/rst/intro_windows.rst index db69c55c5c..5cda3d3376 100644 --- a/docsite/rst/intro_windows.rst +++ b/docsite/rst/intro_windows.rst @@ -364,7 +364,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 raw: Move-Item C:\teststuff\myfile.conf C:\builds\smtp.conf -Bear in mind that using C(raw) will allways 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 C(raw) 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. 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/examples/ansible.cfg b/examples/ansible.cfg index c61f30d359..89da92a3f8 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -328,7 +328,7 @@ # #pipelining = False -# Control the mechanism for transfering files +# Control the mechanism for transferring files # * smart = try sftp and then try scp [default] # * True = use scp only # * False = use sftp only diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index 1515baa4dc..52b1349c9e 100644 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -521,7 +521,7 @@ class GalaxyCLI(CLI): def execute_login(self): """ - Verify user's identify via Github and retreive an auth token from Galaxy. + Verify user's identify via Github and retrieve an auth token from Galaxy. """ # Authenticate with github and retrieve a token if self.options.token is None: @@ -540,7 +540,7 @@ class GalaxyCLI(CLI): token = GalaxyToken() token.set(galaxy_response['token']) - display.display("Succesfully logged into Galaxy as %s" % galaxy_response['username']) + display.display("Successfully logged into Galaxy as %s" % galaxy_response['username']) return 0 def execute_import(self): diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 8081f790a5..055bfd62a3 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -72,7 +72,7 @@ def get_config(p, section, key, env_var, default, value_type=None, expand_relati and return it as a python list. :none: Sets the value to None :path: Expands any environment variables and tilde's in the value. - :tmp_path: Create a unique temporary directory inside of the dirctory + :tmp_path: Create a unique temporary directory inside of the directory specified by value and return its path. :pathlist: Treat the value as a typical PATH string. (On POSIX, this means colon separated strings.) Split the value and then expand diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index f549e8714a..8a3a37e6c8 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -413,7 +413,7 @@ class TaskExecutor: # loop error takes precedence if self._loop_eval_error is not None: raise self._loop_eval_error - # skip conditional exception in the case of includes as the vars needed might not be avaiable except in the included tasks or due to tags + # skip conditional exception in the case of includes as the vars needed might not be available except in the included tasks or due to tags if self._task.action not in ['include', 'include_role']: raise diff --git a/lib/ansible/executor/task_result.py b/lib/ansible/executor/task_result.py index 8de375a026..aae85a9c3e 100644 --- a/lib/ansible/executor/task_result.py +++ b/lib/ansible/executor/task_result.py @@ -23,7 +23,7 @@ from ansible.parsing.dataloader import DataLoader class TaskResult: ''' - This class is responsible for interpretting the resulting data + This class is responsible for interpreting the resulting data from an executed task, and provides helper methods for determining the result of a given task. ''' diff --git a/lib/ansible/inventory/script.py b/lib/ansible/inventory/script.py index 6288b79445..0b0fb1856f 100644 --- a/lib/ansible/inventory/script.py +++ b/lib/ansible/inventory/script.py @@ -152,7 +152,7 @@ class InventoryScript: try: got = self.host_vars_from_top.get(host.name, {}) except AttributeError as e: - raise AnsibleError("Improperly formated host information for %s: %s" % (host.name,to_native(e))) + raise AnsibleError("Improperly formatted host information for %s: %s" % (host.name,to_native(e))) return got cmd = [self.filename, "--host", host.name] diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 9118c17067..a99b4eaedb 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -600,7 +600,7 @@ class Distribution(object): """ This subclass of Facts fills the distribution, distribution_version and distribution_release variables - To do so it checks the existance and content of typical files in /etc containing distribution information + To do so it checks the existence and content of typical files in /etc containing distribution information This is unit tested. Please extend the tests to cover all distributions if you have them available. """ diff --git a/lib/ansible/modules/cloud/amazon/ec2_eip.py b/lib/ansible/modules/cloud/amazon/ec2_eip.py index 22d950f9fb..282be13223 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_eip.py +++ b/lib/ansible/modules/cloud/amazon/ec2_eip.py @@ -77,7 +77,7 @@ notes: pause to delay further playbook execution until the instance is reachable, if necessary. - This module returns multiple changed statuses on disassociation or release. - It returns an overall status based on any changes occuring. It also returns + It returns an overall status based on any changes occurring. It also returns individual changed statuses for disassociation and release. ''' diff --git a/lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py b/lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py index bea3bfbca8..8cb8b676cc 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py +++ b/lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py @@ -122,7 +122,7 @@ def create_scaling_policy(connection, module): if getattr(policy, 'min_adjustment_step') != module.params.get('min_adjustment_step'): changed = True - # set the min adjustment step incase the user decided to change their + # set the min adjustment step in case the user decided to change their # adjustment type to percentage setattr(policy, 'min_adjustment_step', module.params.get('min_adjustment_step')) diff --git a/lib/ansible/modules/cloud/amazon/ec2_vol.py b/lib/ansible/modules/cloud/amazon/ec2_vol.py index 1a9f262102..b6ea9fa598 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_vol.py +++ b/lib/ansible/modules/cloud/amazon/ec2_vol.py @@ -582,7 +582,7 @@ def main(): elif inst is not None: volume, changed = attach_volume(module, ec2, volume, inst) - # Add device, volume_id and volume_type parameters separately to maintain backward compatability + # Add device, volume_id and volume_type parameters separately to maintain backward compatibility volume_info = get_volume_info(volume, state) module.exit_json(changed=changed, volume=volume_info, device=volume_info['attachment_set']['device'], volume_id=volume_info['id'], volume_type=volume_info['type']) elif state == 'absent': diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py index f3f95c107e..704bf15aa1 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py +++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py @@ -960,7 +960,7 @@ def remove(client, nat_gateway_id, wait=False, wait_timeout=0, changed = True success = True err_msg = ( - 'NAT gateway {0} is in a deleting state. Delete was successfull' + 'NAT gateway {0} is in a deleting state. Delete was successful' .format(nat_gateway_id) ) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_subnet.py b/lib/ansible/modules/cloud/azure/azure_rm_subnet.py index 5155715ac2..4eae070f57 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_subnet.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_subnet.py @@ -284,7 +284,7 @@ class AzureRMSubnet(AzureRMModuleBase): subnet) new_subnet = self.get_poller_result(poller) except Exception as exc: - self.fail("Error creating or updateing subnet {0} - {1}".format(self.name, str(exc))) + self.fail("Error creating or updating subnet {0} - {1}".format(self.name, str(exc))) self.check_provisioning_state(new_subnet) return subnet_to_dict(new_subnet) diff --git a/lib/ansible/modules/cloud/cloudstack/cs_cluster.py b/lib/ansible/modules/cloud/cloudstack/cs_cluster.py index 7c9d39e614..a64eedfb1b 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_cluster.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_cluster.py @@ -287,7 +287,7 @@ class AnsibleCloudStackCluster(AnsibleCloudStack): clusters = self.cs.listClusters(**args) if clusters: self.cluster = clusters['cluster'][0] - # fix differnt return from API then request argument given + # fix different return from API then request argument given self.cluster['hypervisor'] = self.cluster['hypervisortype'] self.cluster['clustername'] = self.cluster['name'] return self.cluster diff --git a/lib/ansible/modules/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/cloud/cloudstack/cs_instance.py index 2ac53e1ecd..48632fa28f 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_instance.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_instance.py @@ -175,7 +175,7 @@ options: default: null zone: description: - - Name of the zone in which the instance shoud be deployed. + - Name of the zone in which the instance should be deployed. - If not set, default zone is used. required: false default: null @@ -621,7 +621,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): instance = self.recover_instance(instance=instance) instance = self.update_instance(instance=instance, start_vm=start_vm) - # In check mode, we do not necessarely have an instance + # In check mode, we do not necessarily have an instance if instance: instance = self.ensure_tags(resource=instance, resource_type='UserVm') # refresh instance data diff --git a/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule.py b/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule.py index 2e5f11e415..c3d97ecc59 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule.py @@ -108,7 +108,7 @@ options: default: null zone: description: - - Name of the zone in which the rule shoud be created. + - Name of the zone in which the rule should be created. - If not set, default zone is used. required: false default: null diff --git a/lib/ansible/modules/cloud/lxd/lxd_container.py b/lib/ansible/modules/cloud/lxd/lxd_container.py index 046c5e46db..afe81f62c7 100644 --- a/lib/ansible/modules/cloud/lxd/lxd_container.py +++ b/lib/ansible/modules/cloud/lxd/lxd_container.py @@ -38,7 +38,7 @@ options: required: true architecture: description: - - The archiecture for the container (e.g. "x86_64" or "i686"). + - The architecture for the container (e.g. "x86_64" or "i686"). See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1) required: false config: diff --git a/lib/ansible/modules/cloud/misc/proxmox_kvm.py b/lib/ansible/modules/cloud/misc/proxmox_kvm.py index 790ab6c2d8..59e778aa33 100644 --- a/lib/ansible/modules/cloud/misc/proxmox_kvm.py +++ b/lib/ansible/modules/cloud/misc/proxmox_kvm.py @@ -419,7 +419,7 @@ options: state: description: - Indicates desired state of the instance. - - If C(current), the current state of the VM will be fecthed. You can acces it with C(results.status) + - If C(current), the current state of the VM will be fecthed. You can access it with C(results.status) choices: ['present', 'started', 'absent', 'stopped', 'restarted','current'] required: false default: present diff --git a/lib/ansible/modules/cloud/misc/rhevm.py b/lib/ansible/modules/cloud/misc/rhevm.py index 8789e88028..dada1c4554 100644 --- a/lib/ansible/modules/cloud/misc/rhevm.py +++ b/lib/ansible/modules/cloud/misc/rhevm.py @@ -667,7 +667,7 @@ class RHEVConn(object): setChanged() try: NIC.update() - setMsg('iface has succesfully been updated.') + setMsg('iface has successfully been updated.') except Exception as e: setMsg("Failed to update the iface.") setMsg(str(e)) diff --git a/lib/ansible/modules/cloud/openstack/README.md b/lib/ansible/modules/cloud/openstack/README.md index 36cdcd383f..1caced591a 100644 --- a/lib/ansible/modules/cloud/openstack/README.md +++ b/lib/ansible/modules/cloud/openstack/README.md @@ -17,7 +17,7 @@ Naming detail. A good example of this are floating IPs, which can come from either Nova or Neutron, but which one they come from is immaterial to an end user. * If the module is one that a cloud admin would expect to use, it should be - be named with the service and the resouce, such as os\_keystone\_domain. + be named with the service and the resource, such as os\_keystone\_domain. * If the module is one that a cloud admin and a cloud consumer could both use, the cloud consumer rules apply. @@ -53,7 +53,7 @@ Libraries OpenStack Client libraries. The OpenStack Client libraries do no have end users as a primary audience, they are for intra-server communication. The python-openstacksdk is the future there, and shade will migrate to it when - its ready in a manner that is not noticable to ansible users. + its ready in a manner that is not noticeable to ansible users. Testing ------- diff --git a/lib/ansible/modules/cloud/openstack/_keystone_user.py b/lib/ansible/modules/cloud/openstack/_keystone_user.py index 250c8936be..1d48e9e130 100644 --- a/lib/ansible/modules/cloud/openstack/_keystone_user.py +++ b/lib/ansible/modules/cloud/openstack/_keystone_user.py @@ -284,7 +284,7 @@ def ensure_user_role_exists(keystone, user_name, tenant_name, role_name, Return (True, id) if a new role was created or if the role was newly assigned to the user for the tenant. (False, id) if the role already - exists and was already assigned to the user ofr the tenant. + exists and was already assigned to the user for the tenant. """ # Check if the user has the role in the tenant diff --git a/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py b/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py index b436f7f042..2b095fccbc 100644 --- a/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py +++ b/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py @@ -153,7 +153,7 @@ def main(): if server: cloud.inspect_machine(server['uuid'], module.params['wait']) # TODO(TheJulia): diff properties, ?and ports? and determine - # if a change occured. In theory, the node is always changed + # if a change occurred. In theory, the node is always changed # if introspection is able to update the record. module.exit_json(changed=True, ansible_facts=server['properties']) diff --git a/lib/ansible/modules/cloud/openstack/os_user_role.py b/lib/ansible/modules/cloud/openstack/os_user_role.py index 41b0b73e07..90f7aa2388 100644 --- a/lib/ansible/modules/cloud/openstack/os_user_role.py +++ b/lib/ansible/modules/cloud/openstack/os_user_role.py @@ -58,7 +58,7 @@ options: default: null project: description: - - Name or ID of the project to scope the role assocation to. + - Name or ID of the project to scope the role association to. If you are using keystone version 2, then this value is required. required: false default: null diff --git a/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py b/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py index 3499e73a92..e3d2e99c4b 100644 --- a/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py +++ b/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py @@ -45,7 +45,7 @@ options: default: present choices: ['present', 'absent'] description: - - Determines wether the backend is to be created/modified + - Determines whether the backend is to be created/modified or deleted probe: required: false diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vms.py b/lib/ansible/modules/cloud/ovirt/ovirt_vms.py index 4edfe0aa59..048c81b256 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vms.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vms.py @@ -401,7 +401,7 @@ class VmsModule(BaseModule): """ oVirt in version 4.1 doesn't support search by template+version_number, so we need to list all templates with specific name and then iterate - throught it's version until we find the version we look for. + through it's version until we find the version we look for. """ template = None if self._module.params['template']: diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks.py b/lib/ansible/modules/cloud/profitbricks/profitbricks.py index cfafc8e0a4..bcbecabe01 100644 --- a/lib/ansible/modules/cloud/profitbricks/profitbricks.py +++ b/lib/ansible/modules/cloud/profitbricks/profitbricks.py @@ -109,12 +109,12 @@ options: default: 1 subscription_user: description: - - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. + - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable. required: false default: null subscription_password: description: - - THe ProfitBricks password. Overrides the PB_PASSWORD environement variable. + - THe ProfitBricks password. Overrides the PB_PASSWORD environment variable. required: false default: null wait: diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py index b6ce237165..5215f71c68 100644 --- a/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py +++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py @@ -42,11 +42,11 @@ options: choices: [ "us/las", "de/fra", "de/fkb" ] subscription_user: description: - - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. + - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable. required: false subscription_password: description: - - THe ProfitBricks password. Overrides the PB_PASSWORD environement variable. + - THe ProfitBricks password. Overrides the PB_PASSWORD environment variable. required: false wait: description: diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py index 01377a338b..358b7fba24 100644 --- a/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py +++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py @@ -44,11 +44,11 @@ options: required: true subscription_user: description: - - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. + - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable. required: false subscription_password: description: - - THe ProfitBricks password. Overrides the PB_PASSWORD environement variable. + - THe ProfitBricks password. Overrides the PB_PASSWORD environment variable. required: false wait: description: diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py index caed8579aa..3708903114 100644 --- a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py +++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py @@ -87,11 +87,11 @@ options: required: false subscription_user: description: - - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. + - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable. required: false subscription_password: description: - - THe ProfitBricks password. Overrides the PB_PASSWORD environement variable. + - THe ProfitBricks password. Overrides the PB_PASSWORD environment variable. required: false wait: description: diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py index 1904c470a5..3dacb74998 100644 --- a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py +++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py @@ -40,11 +40,11 @@ options: required: true subscription_user: description: - - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environement variable. + - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable. required: false subscription_password: description: - - THe ProfitBricks password. Overrides the PB_PASSWORD environement variable. + - THe ProfitBricks password. Overrides the PB_PASSWORD environment variable. required: false wait: description: diff --git a/lib/ansible/modules/cloud/softlayer/sl_vm.py b/lib/ansible/modules/cloud/softlayer/sl_vm.py index ef0eba8dbc..33cb8b2281 100644 --- a/lib/ansible/modules/cloud/softlayer/sl_vm.py +++ b/lib/ansible/modules/cloud/softlayer/sl_vm.py @@ -118,7 +118,7 @@ options: default: null post_uri: description: - - URL of a post provisioning script ot be loaded and exectued on virtual instance + - URL of a post provisioning script to be loaded and executed on virtual instance required: false default: null state: diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest.py b/lib/ansible/modules/cloud/vmware/vmware_guest.py index 55b75eb30e..5a24704c36 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_guest.py +++ b/lib/ansible/modules/cloud/vmware/vmware_guest.py @@ -794,7 +794,7 @@ class PyVmomiHelper(object): clonespec_kwargs['config'].memoryMB = \ int(self.params['hardware']['memory_mb']) - # lets try and assign a static ip addresss + # lets try and assign a static ip address if self.params['customize'] is True: ip_settings = list() if self.params['ips']: diff --git a/lib/ansible/modules/cloud/vmware/vmware_vm_shell.py b/lib/ansible/modules/cloud/vmware/vmware_vm_shell.py index 34eb6b0f44..fe28347379 100644 --- a/lib/ansible/modules/cloud/vmware/vmware_vm_shell.py +++ b/lib/ansible/modules/cloud/vmware/vmware_vm_shell.py @@ -84,7 +84,7 @@ options: default: None vm_shell_env: description: - - Comma seperated list of envirnoment variable, specified in the guest OS notation + - Comma separated list of envirnoment variable, specified in the guest OS notation required: False default: None vm_shell_cwd: diff --git a/lib/ansible/modules/clustering/consul.py b/lib/ansible/modules/clustering/consul.py index 4fb244fda9..203704efb9 100644 --- a/lib/ansible/modules/clustering/consul.py +++ b/lib/ansible/modules/clustering/consul.py @@ -56,7 +56,7 @@ options: service_name: description: - Unique name for the service on a node, must be unique per node, - required if registering a service. May be ommitted if registering + required if registering a service. May be omitted if registering a node level check required: false service_id: diff --git a/lib/ansible/modules/clustering/consul_acl.py b/lib/ansible/modules/clustering/consul_acl.py index 2de400aba9..43f953c7b5 100644 --- a/lib/ansible/modules/clustering/consul_acl.py +++ b/lib/ansible/modules/clustering/consul_acl.py @@ -101,7 +101,7 @@ EXAMPLES = ''' - key: 'private/foo' policy: deny - - name: create an acl with specific token with both key and serivce rules + - name: create an acl with specific token with both key and service rules consul_acl: mgmt_token: 'some_management_acl' name: 'Foo access' @@ -186,7 +186,7 @@ def update_acl(module): changed = True except Exception as e: module.fail_json( - msg="No token returned, check your managment key and that \ + msg="No token returned, check your management key and that \ the host is in the acl datacenter %s" % e) except Exception as e: module.fail_json(msg="Could not create/update acl %s" % e) diff --git a/lib/ansible/modules/database/misc/mongodb_user.py b/lib/ansible/modules/database/misc/mongodb_user.py index 7fbcf33226..6674455ae0 100644 --- a/lib/ansible/modules/database/misc/mongodb_user.py +++ b/lib/ansible/modules/database/misc/mongodb_user.py @@ -171,7 +171,7 @@ EXAMPLES = ''' roles: readWriteAnyDatabase state: present -# add a user 'oplog_reader' with read only access to the 'local' database on the replica_set 'belcher'. This is usefull for oplog access (MONGO_OPLOG_URL). +# add a user 'oplog_reader' with read only access to the 'local' database on the replica_set 'belcher'. This is useful for oplog access (MONGO_OPLOG_URL). # please notice the credentials must be added to the 'admin' database because the 'local' database is not syncronized and can't receive user credentials # To login with such user, the connection string should be MONGO_OPLOG_URL="mongodb://oplog_reader:oplog_reader_password@server1,server2/local?authSource=admin" # This syntax requires mongodb 2.6+ and pymongo 2.5+ diff --git a/lib/ansible/modules/files/blockinfile.py b/lib/ansible/modules/files/blockinfile.py index 1160d65cf4..0956935994 100755 --- a/lib/ansible/modules/files/blockinfile.py +++ b/lib/ansible/modules/files/blockinfile.py @@ -107,7 +107,7 @@ options: """ EXAMPLES = r""" -- name: insert/update "Match User" configuation block in /etc/ssh/sshd_config +- name: insert/update "Match User" configuration block in /etc/ssh/sshd_config blockinfile: dest: /etc/ssh/sshd_config block: | diff --git a/lib/ansible/modules/files/patch.py b/lib/ansible/modules/files/patch.py index c5aecf4e0d..e3fbc5e333 100644 --- a/lib/ansible/modules/files/patch.py +++ b/lib/ansible/modules/files/patch.py @@ -37,7 +37,7 @@ options: basedir: description: - Path of a base directory in which the patch file will be applied. - May be ommitted when C(dest) option is specified, otherwise required. + May be omitted when C(dest) option is specified, otherwise required. required: false dest: description: diff --git a/lib/ansible/modules/identity/ipa/ipa_host.py b/lib/ansible/modules/identity/ipa/ipa_host.py index 17b78500bc..2fdfe86f45 100644 --- a/lib/ansible/modules/identity/ipa/ipa_host.py +++ b/lib/ansible/modules/identity/ipa/ipa_host.py @@ -71,7 +71,7 @@ options: user_certificate: description: - List of Base-64 encoded server certificates. - - If option is ommitted certificates will not be checked or changed. + - If option is omitted certificates will not be checked or changed. - If an emtpy list is passed all assigned certificates will be removed. - Certificates already assigned but not passed will be removed. required: false diff --git a/lib/ansible/modules/monitoring/logentries.py b/lib/ansible/modules/monitoring/logentries.py index a85679ef2e..54afd80b04 100644 --- a/lib/ansible/modules/monitoring/logentries.py +++ b/lib/ansible/modules/monitoring/logentries.py @@ -108,7 +108,7 @@ def unfollow_log(module, le_path, logs): removed_count = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for log in logs: # Query the log first, to see if we even need to remove. if not query_log_status(module, le_path, log): diff --git a/lib/ansible/modules/monitoring/logicmonitor.py b/lib/ansible/modules/monitoring/logicmonitor.py index e60f759668..dcb3c70aac 100644 --- a/lib/ansible/modules/monitoring/logicmonitor.py +++ b/lib/ansible/modules/monitoring/logicmonitor.py @@ -1526,7 +1526,7 @@ class Host(LogicMonitor): groups, properties, alertenable): - """Return a property formated hash for the + """Return a property formatted hash for the creation of a host using the rpc function""" self.module.debug("Running Host._build_host_hash...") @@ -2017,7 +2017,7 @@ class Hostgroup(LogicMonitor): description, properties, alertenable): - """Return a property formated hash for the + """Return a property formatted hash for the creation of a hostgroup using the rpc function""" self.module.debug("Running Hostgroup._build_host_hash") diff --git a/lib/ansible/modules/monitoring/zabbix_maintenance.py b/lib/ansible/modules/monitoring/zabbix_maintenance.py index 3c6fee1822..4f1f53f401 100644 --- a/lib/ansible/modules/monitoring/zabbix_maintenance.py +++ b/lib/ansible/modules/monitoring/zabbix_maintenance.py @@ -120,7 +120,7 @@ notes: so if Zabbix server's time and host's time are not synchronized, you will get strange results. - Install required module with 'pip install zabbix-api' command. - - Checks existance only by maintenance name. + - Checks existence only by maintenance name. ''' EXAMPLES = ''' @@ -349,7 +349,7 @@ def main(): (rc, maintenance, error) = get_maintenance_id(zbx, name) if rc != 0: - module.fail_json(msg="Failed to check maintenance %s existance: %s" % (name, error)) + module.fail_json(msg="Failed to check maintenance %s existence: %s" % (name, error)) if not maintenance: if not host_names and not host_groups: @@ -368,7 +368,7 @@ def main(): (rc, maintenance, error) = get_maintenance_id(zbx, name) if rc != 0: - module.fail_json(msg="Failed to check maintenance %s existance: %s" % (name, error)) + module.fail_json(msg="Failed to check maintenance %s existence: %s" % (name, error)) if maintenance: if module.check_mode: diff --git a/lib/ansible/modules/network/asa/asa_acl.py b/lib/ansible/modules/network/asa/asa_acl.py index 366284155f..de00ad43f0 100644 --- a/lib/ansible/modules/network/asa/asa_acl.py +++ b/lib/ansible/modules/network/asa/asa_acl.py @@ -94,7 +94,7 @@ options: desirable to have the task get the current running-config for every task in a playbook. The I(config) argument allows the implementer to pass in the configuruation to use as the base - config for comparision. + config for comparison. required: false default: null """ diff --git a/lib/ansible/modules/network/f5/bigip_device_ntp.py b/lib/ansible/modules/network/f5/bigip_device_ntp.py index 23ed81b781..8856689139 100644 --- a/lib/ansible/modules/network/f5/bigip_device_ntp.py +++ b/lib/ansible/modules/network/f5/bigip_device_ntp.py @@ -153,7 +153,7 @@ class BigIpDeviceNtp(object): r = self.api.tm.sys.ntp.load() if hasattr(r, 'servers'): - # Deliberately using sets to supress duplicates + # Deliberately using sets to suppress duplicates p['servers'] = set([str(x) for x in r.servers]) if hasattr(r, 'timezone'): p['timezone'] = str(r.timezone) diff --git a/lib/ansible/modules/network/f5/bigip_device_sshd.py b/lib/ansible/modules/network/f5/bigip_device_sshd.py index 87ffeb6bee..a1b3699826 100644 --- a/lib/ansible/modules/network/f5/bigip_device_sshd.py +++ b/lib/ansible/modules/network/f5/bigip_device_sshd.py @@ -284,7 +284,7 @@ class BigIpDeviceSshd(object): r = self.api.tm.sys.sshd.load() if hasattr(r, 'allow'): - # Deliberately using sets to supress duplicates + # Deliberately using sets to suppress duplicates p['allow'] = set([str(x) for x in r.allow]) if hasattr(r, 'banner'): p['banner'] = str(r.banner) diff --git a/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py b/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py index fff876007c..440dd7cbaf 100644 --- a/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py +++ b/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py @@ -193,7 +193,7 @@ class BigIpGtmDatacenter(object): ) if hasattr(r, 'servers'): - # Deliberately using sets to supress duplicates + # Deliberately using sets to suppress duplicates p['servers'] = set([str(x) for x in r.servers]) if hasattr(r, 'contact'): p['contact'] = str(r.contact) diff --git a/lib/ansible/modules/network/f5/bigip_pool_member.py b/lib/ansible/modules/network/f5/bigip_pool_member.py index 42d4538f9f..ec16ce08a3 100644 --- a/lib/ansible/modules/network/f5/bigip_pool_member.py +++ b/lib/ansible/modules/network/f5/bigip_pool_member.py @@ -105,7 +105,7 @@ options: ratio: description: - Pool member ratio weight. Valid values range from 1 through 100. - New pool members -- unless overriden with this value -- default + New pool members -- unless overridden with this value -- default to 1. required: false default: null diff --git a/lib/ansible/modules/network/f5/bigip_selfip.py b/lib/ansible/modules/network/f5/bigip_selfip.py index d60dafbf7c..2a9465f625 100644 --- a/lib/ansible/modules/network/f5/bigip_selfip.py +++ b/lib/ansible/modules/network/f5/bigip_selfip.py @@ -536,7 +536,7 @@ class BigIpSelfIp(object): BIG-IP, we need to massage the values that are provided by the user so that they include the partition. - :return: List of vlans formatted with preceeding partition + :return: List of vlans formatted with preceding partition """ partition = self.params['partition'] vlans = self.api.tm.net.vlans.get_collection() diff --git a/lib/ansible/modules/network/netvisor/pn_trunk.py b/lib/ansible/modules/network/netvisor/pn_trunk.py index da3c568f20..3174fc203f 100644 --- a/lib/ansible/modules/network/netvisor/pn_trunk.py +++ b/lib/ansible/modules/network/netvisor/pn_trunk.py @@ -111,10 +111,10 @@ options: - Specify if the configuration receives mirrored traffic. pn_unknown_ucast_level: description: - - Specify an unkown unicast level in percent. The default value is 100%. + - Specify an unknown unicast level in percent. The default value is 100%. pn_unknown_mcast_level: description: - - Specify an unkown multicast level in percent. The default value is 100%. + - Specify an unknown multicast level in percent. The default value is 100%. pn_broadcast_level: description: - Specify a broadcast level in percent. The default value is 100%. diff --git a/lib/ansible/modules/network/snmp_facts.py b/lib/ansible/modules/network/snmp_facts.py index 7801d0f295..034c5f5b91 100644 --- a/lib/ansible/modules/network/snmp_facts.py +++ b/lib/ansible/modules/network/snmp_facts.py @@ -56,7 +56,7 @@ options: required: false integrity: description: - - Hashing algoritm, required if version is v3 + - Hashing algorithm, required if version is v3 choices: [ 'md5', 'sha' ] required: false authkey: @@ -65,7 +65,7 @@ options: required: false privacy: description: - - Encryption algoritm, required if level is authPriv + - Encryption algorithm, required if level is authPriv choices: [ 'des', 'aes' ] required: false privkey: diff --git a/lib/ansible/modules/network/sros/sros_rollback.py b/lib/ansible/modules/network/sros/sros_rollback.py index 77270126f4..bcb4832618 100644 --- a/lib/ansible/modules/network/sros/sros_rollback.py +++ b/lib/ansible/modules/network/sros/sros_rollback.py @@ -43,7 +43,7 @@ options: remote_max_checkpoints: description: - The I(remote_max_checkpoints) argument configures the maximum - number of rollback files that can be transfered and saved to + number of rollback files that can be transferred and saved to a remote location. Valid values for this argument are in the range of 1 to 50 required: false diff --git a/lib/ansible/modules/network/wakeonlan.py b/lib/ansible/modules/network/wakeonlan.py index d49118d60b..f673cad46e 100644 --- a/lib/ansible/modules/network/wakeonlan.py +++ b/lib/ansible/modules/network/wakeonlan.py @@ -84,7 +84,7 @@ def wakeonlan(module, mac, broadcast, port): mac_orig = mac - # Remove possible seperator from MAC address + # Remove possible separator from MAC address if len(mac) == 12 + 5: mac = mac.replace(mac[2], '') diff --git a/lib/ansible/modules/notification/slack.py b/lib/ansible/modules/notification/slack.py index df694da03c..2b06994291 100644 --- a/lib/ansible/modules/notification/slack.py +++ b/lib/ansible/modules/notification/slack.py @@ -182,7 +182,7 @@ def build_payload_for_slack(module, text, channel, username, icon_url, icon_emoj if color == "normal" and text is not None: payload = dict(text=html_escape(text)) elif text is not None: - # With a custom color we have to set the message as attachment, and explicitely turn markdown parsing on for it. + # With a custom color we have to set the message as attachment, and explicitly turn markdown parsing on for it. payload = dict(attachments=[dict(text=html_escape(text), color=color, mrkdwn_in=["text"])]) if channel is not None: if (channel[0] == '#') or (channel[0] == '@'): diff --git a/lib/ansible/modules/packaging/language/composer.py b/lib/ansible/modules/packaging/language/composer.py index dc0a62252b..5b83215f35 100644 --- a/lib/ansible/modules/packaging/language/composer.py +++ b/lib/ansible/modules/packaging/language/composer.py @@ -149,7 +149,7 @@ def has_changed(string): return "Nothing to install or update" not in string def get_available_options(module, command='install'): - # get all availabe options from a composer command using composer help to json + # get all available options from a composer command using composer help to json rc, out, err = composer_command(module, "help %s --format=json" % command) if rc != 0: output = parse_out(err) diff --git a/lib/ansible/modules/packaging/language/pear.py b/lib/ansible/modules/packaging/language/pear.py index 0379538874..98df9f2a21 100644 --- a/lib/ansible/modules/packaging/language/pear.py +++ b/lib/ansible/modules/packaging/language/pear.py @@ -120,7 +120,7 @@ def query_package(module, name, state="present"): def remove_packages(module, packages): remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove installed, updated = query_package(module, package) diff --git a/lib/ansible/modules/packaging/os/apt_rpm.py b/lib/ansible/modules/packaging/os/apt_rpm.py index 47f6b194cf..fe7a78990f 100755 --- a/lib/ansible/modules/packaging/os/apt_rpm.py +++ b/lib/ansible/modules/packaging/os/apt_rpm.py @@ -112,7 +112,7 @@ def update_package_db(module): def remove_packages(module, packages): remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, package): diff --git a/lib/ansible/modules/packaging/os/macports.py b/lib/ansible/modules/packaging/os/macports.py index ac49f1568e..27ea524a08 100644 --- a/lib/ansible/modules/packaging/os/macports.py +++ b/lib/ansible/modules/packaging/os/macports.py @@ -108,7 +108,7 @@ def remove_packages(module, port_path, packages): """ Uninstalls one or more packages if installed. """ remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, port_path, package): diff --git a/lib/ansible/modules/packaging/os/openbsd_pkg.py b/lib/ansible/modules/packaging/os/openbsd_pkg.py index 7d0e9ac945..0f80c4e996 100644 --- a/lib/ansible/modules/packaging/os/openbsd_pkg.py +++ b/lib/ansible/modules/packaging/os/openbsd_pkg.py @@ -448,7 +448,7 @@ def upgrade_packages(module): # Attempt to upgrade all packages. rc, stdout, stderr = execute_command("%s" % upgrade_cmd, module) - # Try to find any occurance of a package changing version like: + # Try to find any occurrence of a package changing version like: # "bzip2-1.0.6->1.0.6p0: ok". match = re.search("\W\w.+->.+: ok\W", stdout) if match: diff --git a/lib/ansible/modules/packaging/os/opkg.py b/lib/ansible/modules/packaging/os/opkg.py index 6360f45af3..bf0f1f669d 100644 --- a/lib/ansible/modules/packaging/os/opkg.py +++ b/lib/ansible/modules/packaging/os/opkg.py @@ -111,7 +111,7 @@ def remove_packages(module, opkg_path, packages): force = "--force-%s" % force remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, opkg_path, package): diff --git a/lib/ansible/modules/packaging/os/pacman.py b/lib/ansible/modules/packaging/os/pacman.py index 89766a4974..9562cb21ec 100644 --- a/lib/ansible/modules/packaging/os/pacman.py +++ b/lib/ansible/modules/packaging/os/pacman.py @@ -216,7 +216,7 @@ def remove_packages(module, pacman_path, packages): args = "R" remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove installed, updated, unknown = query_package(module, pacman_path, package) diff --git a/lib/ansible/modules/packaging/os/pkgin.py b/lib/ansible/modules/packaging/os/pkgin.py index 8e75f2d18c..a66c11fe4a 100755 --- a/lib/ansible/modules/packaging/os/pkgin.py +++ b/lib/ansible/modules/packaging/os/pkgin.py @@ -249,7 +249,7 @@ def remove_packages(module, packages): remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, package): diff --git a/lib/ansible/modules/packaging/os/pkgng.py b/lib/ansible/modules/packaging/os/pkgng.py index 5727b19003..e281f51a02 100644 --- a/lib/ansible/modules/packaging/os/pkgng.py +++ b/lib/ansible/modules/packaging/os/pkgng.py @@ -141,7 +141,7 @@ def pkgng_older_than(module, pkgng_path, compare_version): def remove_packages(module, pkgng_path, packages, dir_arg): remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, pkgng_path, package, dir_arg): diff --git a/lib/ansible/modules/packaging/os/portinstall.py b/lib/ansible/modules/packaging/os/portinstall.py index ccd301e526..3f0e4965e8 100644 --- a/lib/ansible/modules/packaging/os/portinstall.py +++ b/lib/ansible/modules/packaging/os/portinstall.py @@ -109,7 +109,7 @@ def matching_packages(module, name): ports_glob_path = module.get_bin_path('ports_glob', True) rc, out, err = module.run_command("%s %s" % (ports_glob_path, name)) - #counts the numer of packages found + # counts the number of packages found occurrences = out.count('\n') if occurrences == 0: name_without_digits = re.sub('[0-9]', '', name) @@ -130,7 +130,7 @@ def remove_packages(module, packages): pkg_delete_path = module.get_bin_path('pkg', True) pkg_delete_path = pkg_delete_path + " delete -y" - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, package): diff --git a/lib/ansible/modules/packaging/os/slackpkg.py b/lib/ansible/modules/packaging/os/slackpkg.py index 3c4ee4f62e..c6dbf212c1 100644 --- a/lib/ansible/modules/packaging/os/slackpkg.py +++ b/lib/ansible/modules/packaging/os/slackpkg.py @@ -94,7 +94,7 @@ def query_package(module, slackpkg_path, name): def remove_packages(module, slackpkg_path, packages): remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, slackpkg_path, package): diff --git a/lib/ansible/modules/packaging/os/swdepot.py b/lib/ansible/modules/packaging/os/swdepot.py index 6ea7d1059b..3da3f443c5 100644 --- a/lib/ansible/modules/packaging/os/swdepot.py +++ b/lib/ansible/modules/packaging/os/swdepot.py @@ -82,7 +82,7 @@ def compare_package(version1, version2): Return values: -1 first minor 0 equal - 1 fisrt greater """ + 1 first greater """ def normalize(v): return [int(x) for x in re.sub(r'(\.0+)*$', '', v).split(".")] @@ -178,7 +178,7 @@ def main(): rc, output = install_package(module, depot, name) if not rc: - msg = "Packge upgraded, Before " + version_installed + " Now " + version_depot + msg = "Package upgraded, Before " + version_installed + " Now " + version_depot changed = True else: diff --git a/lib/ansible/modules/packaging/os/urpmi.py b/lib/ansible/modules/packaging/os/urpmi.py index e995f1d489..beae17d13d 100644 --- a/lib/ansible/modules/packaging/os/urpmi.py +++ b/lib/ansible/modules/packaging/os/urpmi.py @@ -124,7 +124,7 @@ def update_package_db(module): def remove_packages(module, packages): remove_c = 0 - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove if not query_package(module, package): diff --git a/lib/ansible/modules/packaging/os/xbps.py b/lib/ansible/modules/packaging/os/xbps.py index 0bfe678ab8..24a613f838 100644 --- a/lib/ansible/modules/packaging/os/xbps.py +++ b/lib/ansible/modules/packaging/os/xbps.py @@ -161,7 +161,7 @@ def upgrade(module, xbps_path): def remove_packages(module, xbps_path, packages): """Returns true if package removal succeeds""" changed_packages = [] - # Using a for loop incase of error, we can report the package that failed + # Using a for loop in case of error, we can report the package that failed for package in packages: # Query the package first, to see if we even need to remove installed, updated = query_package(module, xbps_path, package) diff --git a/lib/ansible/modules/system/open_iscsi.py b/lib/ansible/modules/system/open_iscsi.py index 2e3c0e838f..16f45ee6e1 100644 --- a/lib/ansible/modules/system/open_iscsi.py +++ b/lib/ansible/modules/system/open_iscsi.py @@ -80,7 +80,7 @@ options: - whether the list of target nodes on the portal should be (re)discovered and added to the persistent iscsi database. Keep in mind that iscsiadm discovery resets configurtion, like node.startup - to manual, hence combined with auto_node_startup=yes will allways return + to manual, hence combined with auto_node_startup=yes will always return a changed state. show_nodes: required: false diff --git a/lib/ansible/modules/system/svc.py b/lib/ansible/modules/system/svc.py index 378d647bee..f17a6d6578 100755 --- a/lib/ansible/modules/system/svc.py +++ b/lib/ansible/modules/system/svc.py @@ -127,7 +127,7 @@ def _load_dist_subclass(cls, *args, **kwargs): class Svc(object): """ - Main class that handles daemontools, can be subclassed and overriden in case + Main class that handles daemontools, can be subclassed and overridden in case we want to use a 'derivative' like encore, s6, etc """ diff --git a/lib/ansible/modules/web_infrastructure/ejabberd_user.py b/lib/ansible/modules/web_infrastructure/ejabberd_user.py index 84a8dadbf6..b19df27768 100644 --- a/lib/ansible/modules/web_infrastructure/ejabberd_user.py +++ b/lib/ansible/modules/web_infrastructure/ejabberd_user.py @@ -81,7 +81,7 @@ from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.basic import * class EjabberdUserException(Exception): - """ Base exeption for EjabberdUser class object """ + """ Base exception for EjabberdUser class object """ pass class EjabberdUser(object): diff --git a/lib/ansible/modules/web_infrastructure/jenkins_plugin.py b/lib/ansible/modules/web_infrastructure/jenkins_plugin.py index 41568357f1..1d66e19c60 100644 --- a/lib/ansible/modules/web_infrastructure/jenkins_plugin.py +++ b/lib/ansible/modules/web_infrastructure/jenkins_plugin.py @@ -128,7 +128,7 @@ options: - Defines whether to install plugin dependencies. notes: - - Plugin installation shoud be run under root or the same user which owns + - Plugin installation should be run under root or the same user which owns the plugin files on the disk. Only if the plugin is not installed yet and no version is specified, the API installation is performed which requires only the Web UI credentials. diff --git a/lib/ansible/modules/web_infrastructure/letsencrypt.py b/lib/ansible/modules/web_infrastructure/letsencrypt.py index a8541a6d77..06c14a02ab 100644 --- a/lib/ansible/modules/web_infrastructure/letsencrypt.py +++ b/lib/ansible/modules/web_infrastructure/letsencrypt.py @@ -42,14 +42,14 @@ description: - "To use this module, it has to be executed at least twice. Either as two different tasks in the same run or during multiple runs." - "Between these two tasks you have to fulfill the required steps for the - choosen challenge by whatever means necessary. For http-01 that means + chosen challenge by whatever means necessary. For http-01 that means creating the necessary challenge file on the destination webserver. For dns-01 the necessary dns record has to be created. tls-sni-02 requires you to create a SSL certificate with the appropriate subjectAlternativeNames. It is I(not) the responsibility of this module to perform these steps." - "For details on how to fulfill these challenges, you might have to read through U(https://tools.ietf.org/html/draft-ietf-acme-acme-02#section-7)" - - "Although the defaults are choosen so that the module can be used with + - "Although the defaults are chosen so that the module can be used with the Let's Encrypt CA, the module can be used with any service using the ACME protocol." requirements: @@ -293,7 +293,7 @@ class ACMEDirectory(object): class ACMEAccount(object): ''' ACME account object. Handles the authorized communication with the - ACME server. Provides access to accound bound information like + ACME server. Provides access to account bound information like the currently active authorizations and valid certificates ''' def __init__(self,module): @@ -607,7 +607,7 @@ class ACMEClient(object): keyauthorization = self.account.get_keyauthorization(token) # NOTE: tls-sni-01 is not supported by choice - # too complex to be usefull and tls-sni-02 is an alternative + # too complex to be useful and tls-sni-02 is an alternative # as soon as it is implemented server side if type == 'http-01': # https://tools.ietf.org/html/draft-ietf-acme-acme-02#section-7.2 @@ -637,7 +637,7 @@ class ACMEClient(object): def _validate_challenges(self,auth): ''' Validate the authorization provided in the auth dict. Returns True - when the validation was successfull and False when it was not. + when the validation was successful and False when it was not. ''' for challenge in auth['challenges']: if self.challenge != challenge['type']: @@ -716,7 +716,7 @@ class ACMEClient(object): def do_challenges(self): ''' Create new authorizations for all domains of the CSR and return - the challenge details for the choosen challenge type. + the challenge details for the chosen challenge type. ''' data = {} for domain in self.domains: diff --git a/lib/ansible/modules/windows/win_acl.ps1 b/lib/ansible/modules/windows/win_acl.ps1 index 068130a203..971b8dc300 100644 --- a/lib/ansible/modules/windows/win_acl.ps1 +++ b/lib/ansible/modules/windows/win_acl.ps1 @@ -175,7 +175,7 @@ Try { Set-Attr $result "changed" $true; } Catch { - Fail-Json $result "an exception occured when adding the specified rule" + Fail-Json $result "an exception occurred when adding the specified rule" } } ElseIf ($state -eq "absent" -And $match -eq $true) { @@ -185,7 +185,7 @@ Try { Set-Attr $result "changed" $true; } Catch { - Fail-Json $result "an exception occured when removing the specified rule" + Fail-Json $result "an exception occurred when removing the specified rule" } } Else { @@ -200,7 +200,7 @@ Try { } } Catch { - Fail-Json $result "an error occured when attempting to $state $rights permission(s) on $path for $user" + Fail-Json $result "an error occurred when attempting to $state $rights permission(s) on $path for $user" } Exit-Json $result diff --git a/lib/ansible/modules/windows/win_acl_inheritance.ps1 b/lib/ansible/modules/windows/win_acl_inheritance.ps1 index 1933a3a5dd..0d6da54fd9 100644 --- a/lib/ansible/modules/windows/win_acl_inheritance.ps1 +++ b/lib/ansible/modules/windows/win_acl_inheritance.ps1 @@ -80,7 +80,7 @@ Try { } } Catch { - Fail-Json $result "an error occured when attempting to disable inheritance" + Fail-Json $result "an error occurred when attempting to disable inheritance" } Exit-Json $result diff --git a/lib/ansible/modules/windows/win_firewall_rule.py b/lib/ansible/modules/windows/win_firewall_rule.py index 1a5c699f79..d323566ff0 100644 --- a/lib/ansible/modules/windows/win_firewall_rule.py +++ b/lib/ansible/modules/windows/win_firewall_rule.py @@ -48,7 +48,7 @@ options: required: true direction: description: - - is this rule for inbound or outbound trafic + - is this rule for inbound or outbound traffic default: null required: true choices: ['in', 'out'] diff --git a/lib/ansible/modules/windows/win_iis_webapppool.py b/lib/ansible/modules/windows/win_iis_webapppool.py index e2cb8778b5..86a779f9e6 100644 --- a/lib/ansible/modules/windows/win_iis_webapppool.py +++ b/lib/ansible/modules/windows/win_iis_webapppool.py @@ -50,7 +50,7 @@ options: aliases: [] attributes: description: - - Application Pool attributes from string where attributes are seperated by a pipe and attribute name/values by colon Ex. "foo:1|bar:2" + - Application Pool attributes from string where attributes are separated by a pipe and attribute name/values by colon Ex. "foo:1|bar:2" required: false default: null aliases: [] diff --git a/lib/ansible/modules/windows/win_iis_webbinding.ps1 b/lib/ansible/modules/windows/win_iis_webbinding.ps1 index dfd9cdb958..e3fe4bb7ab 100644 --- a/lib/ansible/modules/windows/win_iis_webbinding.ps1 +++ b/lib/ansible/modules/windows/win_iis_webbinding.ps1 @@ -88,7 +88,7 @@ try { if (-not $curent_bindings -and $state -eq 'present') { New-WebBinding @binding_parameters -Force - # Select certificat + # Select certificate if($certificateHash -ne $FALSE) { $ip = $binding_parameters["IPAddress"] diff --git a/lib/ansible/modules/windows/win_iis_website.ps1 b/lib/ansible/modules/windows/win_iis_website.ps1 index 74fc3df302..911af0e8fb 100644 --- a/lib/ansible/modules/windows/win_iis_website.ps1 +++ b/lib/ansible/modules/windows/win_iis_website.ps1 @@ -49,7 +49,7 @@ $bind_hostname = Get-Attr $params "hostname" $FALSE; $bind_ssl = Get-Attr $params "ssl" $FALSE; # Custom site Parameters from string where properties -# are seperated by a pipe and property name/values by colon. +# are separated by a pipe and property name/values by colon. # Ex. "foo:1|bar:2" $parameters = Get-Attr $params "parameters" $null; if($parameters -ne $null) { diff --git a/lib/ansible/modules/windows/win_iis_website.py b/lib/ansible/modules/windows/win_iis_website.py index 9c65c067c9..7f53363128 100644 --- a/lib/ansible/modules/windows/win_iis_website.py +++ b/lib/ansible/modules/windows/win_iis_website.py @@ -91,7 +91,7 @@ options: aliases: [] parameters: description: - - Custom site Parameters from string where properties are seperated by a pipe and property name/values by colon Ex. "foo:1|bar:2" + - Custom site Parameters from string where properties are separated by a pipe and property name/values by colon Ex. "foo:1|bar:2" required: false default: null aliases: [] diff --git a/lib/ansible/modules/windows/win_lineinfile.ps1 b/lib/ansible/modules/windows/win_lineinfile.ps1 index 968f66bae4..31b5b2f9d6 100644 --- a/lib/ansible/modules/windows/win_lineinfile.ps1 +++ b/lib/ansible/modules/windows/win_lineinfile.ps1 @@ -116,7 +116,7 @@ function BackupFile($path) { function Present($dest, $regexp, $line, $insertafter, $insertbefore, $create, $backup, $backrefs, $validate, $encodingobj, $linesep) { # Note that we have to clean up the dest path because ansible wants to treat / and \ as - # interchangable in windows pathnames, but .NET framework internals do not support that. + # interchangeable in windows pathnames, but .NET framework internals do not support that. $cleandest = $dest.Replace("/", "\"); # Check if destination exists. If it does not exist, either create it if create == "yes" diff --git a/lib/ansible/modules/windows/win_owner.ps1 b/lib/ansible/modules/windows/win_owner.ps1 index 076ab84605..56e65f4bc6 100644 --- a/lib/ansible/modules/windows/win_owner.ps1 +++ b/lib/ansible/modules/windows/win_owner.ps1 @@ -130,7 +130,7 @@ Try { } } Catch { - Fail-Json $result "an error occured when attempting to change owner on $path for $user" + Fail-Json $result "an error occurred when attempting to change owner on $path for $user" } Exit-Json $result diff --git a/lib/ansible/modules/windows/win_package.ps1 b/lib/ansible/modules/windows/win_package.ps1 index 544c366086..fd161dd986 100644 --- a/lib/ansible/modules/windows/win_package.ps1 +++ b/lib/ansible/modules/windows/win_package.ps1 @@ -144,9 +144,9 @@ Function Get-RegistryValueIgnoreError } } catch - { + { $exceptionText = ($_ | Out-String).Trim() - Write-Verbose "Exception occured in Get-RegistryValueIgnoreError: $exceptionText" + Write-Verbose "Exception occurred in Get-RegistryValueIgnoreError: $exceptionText" } return $null } diff --git a/lib/ansible/modules/windows/win_robocopy.py b/lib/ansible/modules/windows/win_robocopy.py index c29c07604b..3ff0e3cc6f 100644 --- a/lib/ansible/modules/windows/win_robocopy.py +++ b/lib/ansible/modules/windows/win_robocopy.py @@ -70,7 +70,7 @@ notes: """ EXAMPLES = """ -# Syncs the contents of one diretory to another. +# Syncs the contents of one directory to another. $ ansible -i hosts all -m win_robocopy -a "src=C:\\DirectoryOne dest=C:\\DirectoryTwo" # Sync the contents of one directory to another, including subdirectories. diff --git a/lib/ansible/modules/windows/win_share.ps1 b/lib/ansible/modules/windows/win_share.ps1 index 59e4e8ab81..191082e185 100644 --- a/lib/ansible/modules/windows/win_share.ps1 +++ b/lib/ansible/modules/windows/win_share.ps1 @@ -245,7 +245,7 @@ Try { } } Catch { - Fail-Json $result "an error occured when attempting to create share $name" + Fail-Json $result "an error occurred when attempting to create share $name" } -Exit-Json $result \ No newline at end of file +Exit-Json $result diff --git a/lib/ansible/modules/windows/win_timezone.ps1 b/lib/ansible/modules/windows/win_timezone.ps1 index 03a6935052..6270099097 100644 --- a/lib/ansible/modules/windows/win_timezone.ps1 +++ b/lib/ansible/modules/windows/win_timezone.ps1 @@ -31,7 +31,7 @@ $timezone = Get-Attr -obj $params -name timezone -failifempty $true -resultobj $ Try { # Get the current timezone set $currentTZ = $(tzutil.exe /g) - If ($LASTEXITCODE -ne 0) { Throw "An error occured when getting the current machine's timezone setting." } + If ($LASTEXITCODE -ne 0) { Throw "An error occurred when getting the current machine's timezone setting." / If ( $currentTZ -eq $timezone ) { Exit-Json $result "$timezone is already set on this machine" @@ -40,7 +40,7 @@ Try { $tzExists = $false #Check that timezone can even be set (if it is listed from tzutil as an available timezone to the machine) $tzList = $(tzutil.exe /l) - If ($LASTEXITCODE -ne 0) { Throw "An error occured when listing the available timezones." } + If ($LASTEXITCODE -ne 0) { Throw "An error occurred when listing the available timezones." } ForEach ($tz in $tzList) { If ( $tz -eq $timezone ) { $tzExists = $true @@ -50,9 +50,9 @@ Try { If ( $tzExists ) { tzutil.exe /s "$timezone" - If ($LASTEXITCODE -ne 0) { Throw "An error occured when setting the specified timezone with tzutil." } + If ($LASTEXITCODE -ne 0) { Throw "An error occurred when setting the specified timezone with tzutil." } $newTZ = $(tzutil.exe /g) - If ($LASTEXITCODE -ne 0) { Throw "An error occured when getting the current machine's timezone setting." } + If ($LASTEXITCODE -ne 0) { Throw "An error occurred when getting the current machine's timezone setting." } If ( $timezone -eq $newTZ ) { $result.changed = $true @@ -68,4 +68,4 @@ Catch { } -Exit-Json $result; \ No newline at end of file +Exit-Json $result; diff --git a/lib/ansible/parsing/vault/__init__.py b/lib/ansible/parsing/vault/__init__.py index fcab458fce..3c7a89a94c 100644 --- a/lib/ansible/parsing/vault/__init__.py +++ b/lib/ansible/parsing/vault/__init__.py @@ -369,7 +369,7 @@ class VaultEditor: try: r = call(['shred', tmp_path]) except (OSError, ValueError): - # shred is not available on this system, or some other error occured. + # shred is not available on this system, or some other error occurred. # ValueError caught because OS X El Capitan is raising an # exception big enough to hit a limit in python2-2.7.11 and below. # Symptom is ValueError: insecure pickle when shred is not diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index b04cb7f056..cf2b7b481e 100644 --- a/lib/ansible/playbook/play_context.py +++ b/lib/ansible/playbook/play_context.py @@ -557,7 +557,7 @@ class PlayContext(Base): if self.become_user: flags += ' -u %s ' % self.become_user - #FIXME: make shell independant + #FIXME: make shell independent becomecmd = '%s %s echo %s && %s %s env ANSIBLE=true %s' % (exe, flags, success_key, exe, flags, cmd) elif self.become_method == 'dzdo': diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index d568911f8b..ec89fc51e9 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -427,7 +427,7 @@ class Task(Base, Conditional, Taggable, Become): path_stack = [] dep_chain = self.get_dep_chain() - # inside role: add the dependency chain from current to dependant + # inside role: add the dependency chain from current to dependent if dep_chain: path_stack.extend(reversed([x._role_path for x in dep_chain])) diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index e0adba2715..7242c53446 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -466,7 +466,7 @@ class ActionBase(with_metaclass(ABCMeta, object)): 3 = its a directory, not a file 4 = stat module failed, likely due to not finding python ''' - x = "0" # unknown error has occured + x = "0" # unknown error has occurred try: remote_stat = self._execute_remote_stat(path, all_vars, follow=follow) if remote_stat['exists'] and remote_stat['isdir']: diff --git a/lib/ansible/plugins/callback/foreman.py b/lib/ansible/plugins/callback/foreman.py index 7152f5ac67..a899a71098 100644 --- a/lib/ansible/plugins/callback/foreman.py +++ b/lib/ansible/plugins/callback/foreman.py @@ -45,7 +45,7 @@ class CallbackModule(CallbackBase): FOREMAN_SSL_CERT: X509 certificate to authenticate to Foreman if https is used FOREMAN_SSL_KEY: the corresponding private key - FOREMAN_SSL_VERIFY: wether to verify the Foreman certificate + FOREMAN_SSL_VERIFY: whether to verify the Foreman certificate It can be set to '1' to verify SSL certificates using the installed CAs or to a path pointing to a CA bundle. Set to '0' to disable certificate checking. diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py index 81fd831c6b..959a73a551 100644 --- a/lib/ansible/plugins/strategy/__init__.py +++ b/lib/ansible/plugins/strategy/__init__.py @@ -479,7 +479,7 @@ class StrategyBase: if original_task.action == 'include_vars': for (var_name, var_value) in iteritems(result_item['ansible_facts']): - # find the host we're actually refering too here, which may + # find the host we're actually referring too here, which may # be a host that is not really in inventory at all if original_task.run_once: diff --git a/lib/ansible/utils/module_docs_fragments/ovirt.py b/lib/ansible/utils/module_docs_fragments/ovirt.py index 7334bb8a08..37af795d83 100644 --- a/lib/ansible/utils/module_docs_fragments/ovirt.py +++ b/lib/ansible/utils/module_docs_fragments/ovirt.py @@ -30,7 +30,7 @@ options: description: - "If I(True) the module will fetch additional data from the API." - "It will fetch IDs of the VMs disks, snapshots, etc. User can configure to fetch other - attributes of the nested entities by specifing C(nested_attributes)." + attributes of the nested entities by specifying C(nested_attributes)." version_added: "2.3" nested_attributes: description: diff --git a/lib/ansible/utils/module_docs_fragments/ovirt_facts.py b/lib/ansible/utils/module_docs_fragments/ovirt_facts.py index c46c3b3798..571ae6ca20 100644 --- a/lib/ansible/utils/module_docs_fragments/ovirt_facts.py +++ b/lib/ansible/utils/module_docs_fragments/ovirt_facts.py @@ -20,14 +20,14 @@ class ModuleDocFragment(object): - # facts standart oVirt documentation fragment + # facts standard oVirt documentation fragment DOCUMENTATION = ''' options: fetch_nested: description: - "If I(True) the module will fetch additional data from the API." - "It will fetch IDs of the VMs disks, snapshots, etc. User can configure to fetch other - attributes of the nested entities by specifing C(nested_attributes)." + attributes of the nested entities by specifying C(nested_attributes)." version_added: "2.3" nested_attributes: description: diff --git a/test/integration/targets/postgresql/tasks/main.yml b/test/integration/targets/postgresql/tasks/main.yml index c9e0ec408c..c7ca95ee34 100644 --- a/test/integration/targets/postgresql/tasks/main.yml +++ b/test/integration/targets/postgresql/tasks/main.yml @@ -442,7 +442,7 @@ - "result.stdout_lines[-1] == '(0 rows)'" # -# Test settings privleges +# Test settings privileges # - name: Create db become_user: postgres diff --git a/test/integration/targets/template/tasks/main.yml b/test/integration/targets/template/tasks/main.yml index 6681e15674..c4f0f2910b 100644 --- a/test/integration/targets/template/tasks/main.yml +++ b/test/integration/targets/template/tasks/main.yml @@ -106,7 +106,7 @@ - "dir_attrs.stat.pw_name == 'nobody'" - "dir_attrs.stat.mode == '0755'" -- name: Check that template to a dirctory where the directory does not end with a / is allowed +- name: Check that template to a directory where the directory does not end with a / is allowed template: src=foo.j2 dest={{output_dir | expanduser}}/template-dir mode=0600 owner=root group={{ group.stdout }} - name: make a symlink to the templated file diff --git a/test/integration/targets/win_regmerge/tasks/main.yml b/test/integration/targets/win_regmerge/tasks/main.yml index fde2e4d998..15c754de6d 100644 --- a/test/integration/targets/win_regmerge/tasks/main.yml +++ b/test/integration/targets/win_regmerge/tasks/main.yml @@ -47,7 +47,7 @@ path: "{{win_output_dir}}\\settings1.reg" register: merge12_result -# without a compare to key, should allways report changed +# without a compare to key, should always report changed - assert: that: - "merge12_result.changed == true"