diff options
| author | Andrey Klychkov <aaklychkov@mail.ru> | 2019-09-11 20:40:22 +0200 |
|---|---|---|
| committer | Alicia Cozine <879121+acozine@users.noreply.github.com> | 2019-09-11 20:40:22 +0200 |
| commit | 5eb5f740838d447287ed49533c76864247f731a7 (patch) | |
| tree | 469b518aac931b4c804f507151e718338fb71481 | |
| parent | rabbitmq_publish fix for incorrectly stating message was not published to the... (diff) | |
| download | ansible-5eb5f740838d447287ed49533c76864247f731a7.tar.xz ansible-5eb5f740838d447287ed49533c76864247f731a7.zip | |
fix typos in modules (#62135)
66 files changed, 85 insertions, 86 deletions
diff --git a/lib/ansible/modules/crypto/acme/acme_account_info.py b/lib/ansible/modules/crypto/acme/acme_account_info.py index 760d5d0e4b..67a623d36f 100644 --- a/lib/ansible/modules/crypto/acme/acme_account_info.py +++ b/lib/ansible/modules/crypto/acme/acme_account_info.py @@ -174,7 +174,7 @@ orders: returned: when server returns this error: description: - - In case an error occured during processing, this contains information about the error. + - In case an error occurred during processing, this contains information about the error. - The field is structured as a problem document (RFC7807). type: complex returned: when an error occurred diff --git a/lib/ansible/modules/crypto/acme/acme_certificate.py b/lib/ansible/modules/crypto/acme/acme_certificate.py index 6b3a7e1048..28152d031e 100644 --- a/lib/ansible/modules/crypto/acme/acme_certificate.py +++ b/lib/ansible/modules/crypto/acme/acme_certificate.py @@ -532,7 +532,7 @@ class ACMEClient(object): def _add_or_update_auth(self, identifier_type, identifier, auth): ''' - Add or update the given authroization in the global authorizations list. + Add or update the given authorization in the global authorizations list. Return True if the auth was updated/added and False if no change was necessary. ''' diff --git a/lib/ansible/modules/crypto/acme/acme_certificate_revoke.py b/lib/ansible/modules/crypto/acme/acme_certificate_revoke.py index fc3a097177..ed980907e0 100644 --- a/lib/ansible/modules/crypto/acme/acme_certificate_revoke.py +++ b/lib/ansible/modules/crypto/acme/acme_certificate_revoke.py @@ -202,7 +202,7 @@ def main(): result, info = account.send_signed_request(endpoint, payload) if info['status'] != 200: already_revoked = False - # Standarized error from draft 14 on (https://tools.ietf.org/html/rfc8555#section-7.6) + # Standardized error from draft 14 on (https://tools.ietf.org/html/rfc8555#section-7.6) if result.get('type') == 'urn:ietf:params:acme:error:alreadyRevoked': already_revoked = True else: diff --git a/lib/ansible/modules/crypto/luks_device.py b/lib/ansible/modules/crypto/luks_device.py index f3f74b45d1..7333921610 100644 --- a/lib/ansible/modules/crypto/luks_device.py +++ b/lib/ansible/modules/crypto/luks_device.py @@ -356,7 +356,7 @@ class CryptHandler(Handler): % (device, result[STDERR])) def run_luks_add_key(self, device, keyfile, new_keyfile): - ''' Add new key to given 'device'; authentization done using 'keyfile' + ''' Add new key to given 'device'; authentication done using 'keyfile' Raises ValueError when command fails ''' result = self._run_command([self._cryptsetup_bin, 'luksAddKey', device, diff --git a/lib/ansible/modules/crypto/openssh_cert.py b/lib/ansible/modules/crypto/openssh_cert.py index 2b41bd8a24..e27ce4f81f 100644 --- a/lib/ansible/modules/crypto/openssh_cert.py +++ b/lib/ansible/modules/crypto/openssh_cert.py @@ -363,7 +363,7 @@ class Certificate(object): def is_same_datetime(self, datetime_one, datetime_two): - # This function is for backwards compatability only because .total_seconds() is new in python2.7 + # This function is for backwards compatibility only because .total_seconds() is new in python2.7 def timedelta_total_seconds(time_delta): return (time_delta.microseconds + 0.0 + (time_delta.seconds + time_delta.days * 24 * 3600) * 10 ** 6) / 10 ** 6 # try to use .total_ seconds() from python2.7 diff --git a/lib/ansible/modules/crypto/openssl_csr.py b/lib/ansible/modules/crypto/openssl_csr.py index f8dd89ae40..0436156d26 100644 --- a/lib/ansible/modules/crypto/openssl_csr.py +++ b/lib/ansible/modules/crypto/openssl_csr.py @@ -319,7 +319,7 @@ EXAMPLES = r''' - www.ansible.com - m.ansible.com -- name: Force re-generate an OpenSSL Certificate Signing Request +- name: Force regenerate an OpenSSL Certificate Signing Request openssl_csr: path: /etc/ssl/csr/www.ansible.com.csr privatekey_path: /etc/ssl/private/ansible.com.pem diff --git a/lib/ansible/modules/crypto/openssl_csr_info.py b/lib/ansible/modules/crypto/openssl_csr_info.py index 98a90b49e2..60ecc52395 100644 --- a/lib/ansible/modules/crypto/openssl_csr_info.py +++ b/lib/ansible/modules/crypto/openssl_csr_info.py @@ -527,7 +527,7 @@ class CertificateSigningRequestInfoPyOpenSSL(CertificateSigningRequestInfo): return None, False def _normalize_san(self, san): - # apperently openssl returns 'IP address' not 'IP' as specifier when converting the subjectAltName to string + # apparently openssl returns 'IP address' not 'IP' as specifier when converting the subjectAltName to string # although it won't accept this specifier when generating the CSR. (https://github.com/openssl/openssl/issues/4004) if san.startswith('IP Address:'): san = 'IP:' + san[len('IP Address:'):] diff --git a/lib/ansible/modules/crypto/openssl_pkcs12.py b/lib/ansible/modules/crypto/openssl_pkcs12.py index 6537349546..39b690b43f 100644 --- a/lib/ansible/modules/crypto/openssl_pkcs12.py +++ b/lib/ansible/modules/crypto/openssl_pkcs12.py @@ -271,7 +271,7 @@ class Pkcs(crypto_utils.OpenSSLObject): return False if pkcs12_privatekey: - # This check is required because pyOpenSSL will not return a firendly name + # This check is required because pyOpenSSL will not return a friendly name # if the private key is not set in the file if ((self.pkcs12.get_friendlyname() is not None) and (pkcs12_friendly_name is not None)): if self.pkcs12.get_friendlyname() != pkcs12_friendly_name: diff --git a/lib/ansible/modules/files/blockinfile.py b/lib/ansible/modules/files/blockinfile.py index 163eaee56b..7069b9f79c 100644 --- a/lib/ansible/modules/files/blockinfile.py +++ b/lib/ansible/modules/files/blockinfile.py @@ -269,7 +269,7 @@ def main(): marker0 = re.sub(b(r'{mark}'), b(params['marker_begin']), marker) marker1 = re.sub(b(r'{mark}'), b(params['marker_end']), marker) if present and block: - # Escape seqeuences like '\n' need to be handled in Ansible 1.x + # Escape sequences like '\n' need to be handled in Ansible 1.x if module.ansible_version.startswith('1.'): block = re.sub('', block, '') blocklines = [marker0] + block.splitlines() + [marker1] diff --git a/lib/ansible/modules/files/file.py b/lib/ansible/modules/files/file.py index ab73becd41..daa5a490fe 100644 --- a/lib/ansible/modules/files/file.py +++ b/lib/ansible/modules/files/file.py @@ -770,7 +770,7 @@ def ensure_symlink(path, src, follow, force, timestamps): # Now that we might have created the symlink, get the arguments. # We need to do it now so we can properly follow the symlink if needed # because load_file_common_arguments sets 'path' according - # the value of follow and the symlink existance. + # the value of follow and the symlink existence. file_args = module.load_file_common_arguments(module.params) # Whenever we create a link to a nonexistent target we know that the nonexistent target diff --git a/lib/ansible/modules/files/synchronize.py b/lib/ansible/modules/files/synchronize.py index aade574028..4d4f50f16c 100644 --- a/lib/ansible/modules/files/synchronize.py +++ b/lib/ansible/modules/files/synchronize.py @@ -200,7 +200,7 @@ notes: - rsync daemon must be up and running with correct permission when using rsync protocol in source or destination path. - The C(synchronize) module forces `--delay-updates` to avoid leaving a destination in a broken in-between state if the underlying rsync process encounters an error. Those synchronizing large numbers of files that are willing to trade safety for performance should call rsync directly. - - link_destination is subject to the same limitations as the underlaying rsync daemon. Hard links are only preserved if the relative subtrees + - link_destination is subject to the same limitations as the underlying rsync daemon. Hard links are only preserved if the relative subtrees of the source and destination are the same. Attempts to hardlink into a directory that is a subdirectory of the source will be prevented. seealso: - module: copy diff --git a/lib/ansible/modules/files/xml.py b/lib/ansible/modules/files/xml.py index 1f29e03165..5e707c6525 100644 --- a/lib/ansible/modules/files/xml.py +++ b/lib/ansible/modules/files/xml.py @@ -274,7 +274,7 @@ EXAMPLES = r''' xpath: /business/website children: [] -# In case of namespaces, like in below XML, they have to be explicitely stated. +# In case of namespaces, like in below XML, they have to be explicitly stated. # # <foo xmlns="http://x.test" xmlns:attr="http://z.test"> # <bar> @@ -639,7 +639,7 @@ def set_target_inner(module, tree, xpath, namespaces, attribute, value): except Exception as e: missing_namespace = "" # NOTE: This checks only the namespaces defined in root element! - # TODO: Implement a more robust check to check for child namespaces' existance + # TODO: Implement a more robust check to check for child namespaces' existence if tree.getroot().nsmap and ":" not in xpath: missing_namespace = "XML document has namespace(s) defined, but no namespace prefix(es) used in xpath!\n" module.fail_json(msg="%sXpath %s causes a failure: %s\n -- tree is %s" % diff --git a/lib/ansible/modules/monitoring/grafana_datasource.py b/lib/ansible/modules/monitoring/grafana_datasource.py index 9cc3434fd9..56060f26b3 100644 --- a/lib/ansible/modules/monitoring/grafana_datasource.py +++ b/lib/ansible/modules/monitoring/grafana_datasource.py @@ -155,7 +155,7 @@ options: default: second sslmode: description: - - SSL mode for C(postgres) datasoure type. + - SSL mode for C(postgres) datasource type. choices: [ disable, require, verify-ca, verify-full ] trends: required: false diff --git a/lib/ansible/modules/monitoring/librato_annotation.py b/lib/ansible/modules/monitoring/librato_annotation.py index 9f79b3b05d..aaaca3613f 100644 --- a/lib/ansible/modules/monitoring/librato_annotation.py +++ b/lib/ansible/modules/monitoring/librato_annotation.py @@ -47,7 +47,7 @@ options: required: false description: description: - - The description contains extra meta-data about a particular annotation + - The description contains extra metadata about a particular annotation - The description should contain specifics on the individual annotation e.g. Deployed 9b562b2 shipped new feature foo! required: false start_time: diff --git a/lib/ansible/modules/monitoring/logicmonitor.py b/lib/ansible/modules/monitoring/logicmonitor.py index 570777f435..049b640174 100644 --- a/lib/ansible/modules/monitoring/logicmonitor.py +++ b/lib/ansible/modules/monitoring/logicmonitor.py @@ -52,7 +52,7 @@ options: NOTE Host and Hostgroup tasks should always be performed via delegate_to: localhost. There are no benefits to running these tasks on the remote host and doing so will typically cause problems. required: true - choices: ['collector', 'host', 'datsource', 'hostgroup'] + choices: ['collector', 'host', 'datasource', 'hostgroup'] action: description: - The action you wish to perform on target. @@ -1185,7 +1185,7 @@ class Host(LogicMonitor): self.groups = None def create(self): - """Idemopotent function to create if missing, + """Idempotent function to create if missing, update if changed, or skip""" self.module.debug("Running Host.create...") diff --git a/lib/ansible/modules/monitoring/logicmonitor_facts.py b/lib/ansible/modules/monitoring/logicmonitor_facts.py index 3af19567bc..4d61741e3e 100644 --- a/lib/ansible/modules/monitoring/logicmonitor_facts.py +++ b/lib/ansible/modules/monitoring/logicmonitor_facts.py @@ -369,7 +369,7 @@ class LogicMonitor(object): class Host(LogicMonitor): def __init__(self, params, module=None): - """Initializor for the LogicMonitor host object""" + """Initializer for the LogicMonitor host object""" self.change = False self.params = params self.collector = None @@ -469,7 +469,7 @@ class Host(LogicMonitor): class Hostgroup(LogicMonitor): def __init__(self, params, module=None): - """Initializor for the LogicMonitor host object""" + """Initializer for the LogicMonitor host object""" self.change = False self.params = params diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_action.py b/lib/ansible/modules/monitoring/zabbix/zabbix_action.py index 48893ec3e7..9c117228f3 100644 --- a/lib/ansible/modules/monitoring/zabbix/zabbix_action.py +++ b/lib/ansible/modules/monitoring/zabbix/zabbix_action.py @@ -121,7 +121,7 @@ options: - When I(type) is set to C(trigger_severity), the choices are (case-insensitive) C(not classified), C(information), C(warning), C(average), C(high), C(disaster) irrespective of user-visible names being changed in Zabbix. Defaults to C(not classified) if omitted. - - Besides the above options, this is usualy either the name + - Besides the above options, this is usually either the name of the object or a string to compare with. operator: description: @@ -784,7 +784,7 @@ class Action(object): self._zapi_wrapper = zapi_wrapper def _construct_parameters(self, **kwargs): - """Contruct parameters. + """Construct parameters. Args: **kwargs: Arbitrary keyword parameters. @@ -1609,7 +1609,7 @@ def compare_dictionaries(d1, d2, diff_dict): Used in recursion with compare_lists() function. Args: d1: first dictionary to compare - d2: second ditionary to compare + d2: second dictionary to compare diff_dict: dictionary to store the difference Returns: diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_template.py b/lib/ansible/modules/monitoring/zabbix/zabbix_template.py index 59f2b3ebae..275288d7f5 100644 --- a/lib/ansible/modules/monitoring/zabbix/zabbix_template.py +++ b/lib/ansible/modules/monitoring/zabbix/zabbix_template.py @@ -54,7 +54,7 @@ options: version_added: '2.9' template_groups: description: - - List of host groups to add template to when template is createad. + - List of host groups to add template to when template is created. - Replaces the current host groups the template belongs to if the template is already present. - Required when creating a new template with C(state=present) and I(template_name) is used. Not required when updating an existing template. @@ -363,7 +363,7 @@ class Template(object): template_macros, template_content, template_type): """Compares template parameters to already existing values if any are found. - template_json - JSON structures are compared as deep sorted dictonaries, + template_json - JSON structures are compared as deep sorted dictionaries, template_xml - XML structures are compared as strings, but filtered and formatted first, If none above is used, all the other arguments are compared to their existing counterparts retrieved from Zabbix API.""" @@ -379,7 +379,7 @@ class Template(object): return changed existing_template = self.dump_template(template_ids, template_type='json') - # Compare JSON objects as deep sorted python dictonaries + # Compare JSON objects as deep sorted python dictionaries if template_content is not None and template_type == 'json': parsed_template_json = self.load_json_template(template_content) if self.diff_template(parsed_template_json, existing_template): @@ -509,7 +509,7 @@ class Template(object): if element.text is None and len(list(element)) == 0: template.remove(element) - # Filter new lines and identation + # Filter new lines and indentation xml_root_text = list(line.strip() for line in ET.tostring(parsed_xml_root).split('\n')) return ''.join(xml_root_text) diff --git a/lib/ansible/modules/notification/snow_record_find.py b/lib/ansible/modules/notification/snow_record_find.py index a5bd12f1a7..f6abf1caa6 100644 --- a/lib/ansible/modules/notification/snow_record_find.py +++ b/lib/ansible/modules/notification/snow_record_find.py @@ -41,7 +41,7 @@ options: order_by: description: - Field to sort the results on. - - Can prefix with "-" or "+" to change decending or ascending sort order. + - Can prefix with "-" or "+" to change descending or ascending sort order. type: str default: "-created_on" required: false diff --git a/lib/ansible/modules/packaging/language/bundler.py b/lib/ansible/modules/packaging/language/bundler.py index 47b292fe94..98da0b9383 100644 --- a/lib/ansible/modules/packaging/language/bundler.py +++ b/lib/ansible/modules/packaging/language/bundler.py @@ -31,7 +31,7 @@ options: default: present chdir: description: - - The directory to execute the bundler commands from. This directoy + - The directory to execute the bundler commands from. This directory needs to contain a valid Gemfile or .bundle/ directory default: temporary working directory exclude_groups: diff --git a/lib/ansible/modules/packaging/language/gem.py b/lib/ansible/modules/packaging/language/gem.py index dfde128832..f398df0c95 100644 --- a/lib/ansible/modules/packaging/language/gem.py +++ b/lib/ansible/modules/packaging/language/gem.py @@ -61,7 +61,7 @@ options: install_dir: description: - Install the gems into a specific directory. - These gems will be independant from the global installed ones. + These gems will be independent from the global installed ones. Specifying this requires user_install to be false. required: false version_added: "2.6" diff --git a/lib/ansible/modules/packaging/os/dnf.py b/lib/ansible/modules/packaging/os/dnf.py index 180c1651d6..55f569bc06 100644 --- a/lib/ansible/modules/packaging/os/dnf.py +++ b/lib/ansible/modules/packaging/os/dnf.py @@ -1222,7 +1222,7 @@ class DnfModule(YumDnf): ) # Set state as installed by default - # This is not set in AnsibleModule() because the following shouldn't happend + # This is not set in AnsibleModule() because the following shouldn't happen # - dnf: autoremove=yes state=installed if self.state is None: self.state = 'installed' diff --git a/lib/ansible/modules/packaging/os/flatpak.py b/lib/ansible/modules/packaging/os/flatpak.py index 66f92bf923..301f09be03 100644 --- a/lib/ansible/modules/packaging/os/flatpak.py +++ b/lib/ansible/modules/packaging/os/flatpak.py @@ -65,7 +65,7 @@ options: - The name of the flatpak to manage. - When used with I(state=present), I(name) can be specified as an C(http(s)) URL to a C(flatpakref) file or the unique reverse DNS name that identifies a flatpak. - - When suppying a reverse DNS name, you can use the I(remote) option to specify on what remote + - When supplying a reverse DNS name, you can use the I(remote) option to specify on what remote to look for the flatpak. An example for a reverse DNS name is C(org.gnome.gedit). - When used with I(state=absent), it is recommended to specify the name in the reverse DNS format. diff --git a/lib/ansible/modules/packaging/os/package_facts.py b/lib/ansible/modules/packaging/os/package_facts.py index 36339f61d6..ae08154eac 100644 --- a/lib/ansible/modules/packaging/os/package_facts.py +++ b/lib/ansible/modules/packaging/os/package_facts.py @@ -28,7 +28,7 @@ options: type: list strategy: description: - - This option controls how the module queres the package managers on the system. + - This option controls how the module queries the package managers on the system. C(first) means it will return only information for the first supported package manager available. C(all) will return information for all supported and available package managers on the system. choices: ['first', 'all'] diff --git a/lib/ansible/modules/packaging/os/pkgin.py b/lib/ansible/modules/packaging/os/pkgin.py index f930a5e41b..8220128a21 100644 --- a/lib/ansible/modules/packaging/os/pkgin.py +++ b/lib/ansible/modules/packaging/os/pkgin.py @@ -285,7 +285,7 @@ def update_package_db(module): if rc == 0: if re.search('database for.*is up-to-date\n$', out): - return False, "datebase is up-to-date" + return False, "database is up-to-date" else: return True, "updated repository database" else: diff --git a/lib/ansible/modules/packaging/os/rhn_channel.py b/lib/ansible/modules/packaging/os/rhn_channel.py index e1736c069b..981c662647 100644 --- a/lib/ansible/modules/packaging/os/rhn_channel.py +++ b/lib/ansible/modules/packaging/os/rhn_channel.py @@ -119,10 +119,10 @@ def main(): try: session = client.auth.login(user, password) except Exception as e: - module.fail_json(msg="Unable to establish session with Sattelite server: %s " % to_text(e)) + module.fail_json(msg="Unable to establish session with Satellite server: %s " % to_text(e)) if not session: - module.fail_json(msg="Failed to establish session with Sattelite server.") + module.fail_json(msg="Failed to establish session with Satellite server.") # get systemid try: diff --git a/lib/ansible/modules/packaging/os/rhn_register.py b/lib/ansible/modules/packaging/os/rhn_register.py index a7a829bf74..c5956b5e8d 100644 --- a/lib/ansible/modules/packaging/os/rhn_register.py +++ b/lib/ansible/modules/packaging/os/rhn_register.py @@ -358,7 +358,7 @@ def main(): channels=dict(type='list', default=[]), ), # username/password is required for state=absent, or if channels is not empty - # (basically anything that uses self.api requires username/password) but it doesnt + # (basically anything that uses self.api requires username/password) but it doesn't # look like we can express that with required_if/required_together/mutually_exclusive # only username+password can be used for unregister diff --git a/lib/ansible/modules/packaging/os/rhsm_repository.py b/lib/ansible/modules/packaging/os/rhsm_repository.py index ab1eaba6bb..36ca529aed 100644 --- a/lib/ansible/modules/packaging/os/rhsm_repository.py +++ b/lib/ansible/modules/packaging/os/rhsm_repository.py @@ -87,7 +87,7 @@ from ansible.module_utils.basic import AnsibleModule def run_subscription_manager(module, arguments): - # Execute subuscription-manager with arguments and manage common errors + # Execute subscription-manager with arguments and manage common errors rhsm_bin = module.get_bin_path('subscription-manager') if not rhsm_bin: module.fail_json(msg='The executable file subscription-manager was not found in PATH') diff --git a/lib/ansible/modules/packaging/os/snap.py b/lib/ansible/modules/packaging/os/snap.py index e892ab1ad3..d5d2e80855 100644 --- a/lib/ansible/modules/packaging/os/snap.py +++ b/lib/ansible/modules/packaging/os/snap.py @@ -39,7 +39,7 @@ options: choices: [ absent, present ] classic: description: - - Confinement policy. The classic confinment allows a snap to have + - Confinement policy. The classic confinement allows a snap to have the same level of access to the system as "classic" packages, like those managed by APT. This option corresponds to the --classic argument. This option can only be specified if there is a single snap in the task. diff --git a/lib/ansible/modules/packaging/os/swupd.py b/lib/ansible/modules/packaging/os/swupd.py index e2da616ee1..fd9b7791c4 100644 --- a/lib/ansible/modules/packaging/os/swupd.py +++ b/lib/ansible/modules/packaging/os/swupd.py @@ -33,7 +33,7 @@ options: If not specified, the default format is used. manifest: description: - - The manifest contains information about the bundles at certaion version of the OS. + - The manifest contains information about the bundles at certain version of the OS. Specify a Manifest version to verify against that version or leave unspecified to verify against the current version. aliases: [release, version] diff --git a/lib/ansible/modules/packaging/os/yum.py b/lib/ansible/modules/packaging/os/yum.py index 880b797f8f..ef188ed280 100644 --- a/lib/ansible/modules/packaging/os/yum.py +++ b/lib/ansible/modules/packaging/os/yum.py @@ -393,7 +393,7 @@ class YumModule(YumDnf): self.lockfile = '/var/run/yum.pid' def _enablerepos_with_error_checking(self, yumbase): - # NOTE: This seems unintuitive, but it mirrors yum's CLI bahavior + # NOTE: This seems unintuitive, but it mirrors yum's CLI behavior if len(self.enablerepo) == 1: try: yumbase.repos.enableRepo(self.enablerepo[0]) @@ -662,7 +662,7 @@ class YumModule(YumDnf): pkgs = my.returnPackagesByDep(req_spec) + my.returnInstalledPackagesByDep(req_spec) except Exception as e: # If a repo with `repo_gpgcheck=1` is added and the repo GPG - # key was never accepted, quering this repo will throw an + # key was never accepted, querying this repo will throw an # error: 'repomd.xml signature could not be verified'. In that # situation we need to run `yum -y makecache` which will accept # the key and try again. @@ -962,7 +962,7 @@ class YumModule(YumDnf): (name, ver, rel, epoch, arch) = splitFilename(envra) installed_pkgs = self.is_installed(repoq, name) - # case for two same envr but differrent archs like x86_64 and i686 + # case for two same envr but different archs like x86_64 and i686 if len(installed_pkgs) == 2: (cur_name0, cur_ver0, cur_rel0, cur_epoch0, cur_arch0) = splitFilename(installed_pkgs[0]) (cur_name1, cur_ver1, cur_rel1, cur_epoch1, cur_arch1) = splitFilename(installed_pkgs[1]) @@ -1146,7 +1146,7 @@ class YumModule(YumDnf): installed = self.is_installed(repoq, pkg) if installed: - # Return a mesage so it's obvious to the user why yum failed + # Return a message so it's obvious to the user why yum failed # and which package couldn't be removed. More details: # https://github.com/ansible/ansible/issues/35672 res['msg'] = "Package '%s' couldn't be removed!" % pkg @@ -1462,7 +1462,7 @@ class YumModule(YumDnf): self.yum_basecmd.extend(e_cmd) if self.state in ('installed', 'present', 'latest'): - """ The need of this entire if conditional has to be chalanged + """ The need of this entire if conditional has to be changed this function is the ensure function that is called in the main section. diff --git a/lib/ansible/modules/source_control/git.py b/lib/ansible/modules/source_control/git.py index 95626c3df6..29529e56c5 100644 --- a/lib/ansible/modules/source_control/git.py +++ b/lib/ansible/modules/source_control/git.py @@ -1025,7 +1025,7 @@ def create_archive(git_path, module, dest, archive, version, repo, result): except OSError as e: module.fail_json(msg="Failed to move %s to %s" % (new_archive, archive), - details=u"Error occured while moving : %s" + details=u"Error occurred while moving : %s" % to_text(e)) else: # Perform archive from local directory diff --git a/lib/ansible/modules/source_control/gitlab_hook.py b/lib/ansible/modules/source_control/gitlab_hook.py index a1ff274b55..f254580def 100644 --- a/lib/ansible/modules/source_control/gitlab_hook.py +++ b/lib/ansible/modules/source_control/gitlab_hook.py @@ -191,7 +191,7 @@ class GitLabHook(object): self.hookObject = None ''' - @param prokect Project Object + @param project Project Object @param hook_url Url to call on event @param description Description of the group @param parent Parent group full path diff --git a/lib/ansible/modules/source_control/gitlab_project_variable.py b/lib/ansible/modules/source_control/gitlab_project_variable.py index 1ea4115cea..f846ea3c41 100644 --- a/lib/ansible/modules/source_control/gitlab_project_variable.py +++ b/lib/ansible/modules/source_control/gitlab_project_variable.py @@ -47,7 +47,7 @@ options: type: str purge: description: - - When set to true, all variables which are not untoucheded in the task will be deleted. + - When set to true, all variables which are not untouched in the task will be deleted. default: false type: bool vars: diff --git a/lib/ansible/modules/source_control/gitlab_user.py b/lib/ansible/modules/source_control/gitlab_user.py index 16a0d221c8..9aca86923c 100644 --- a/lib/ansible/modules/source_control/gitlab_user.py +++ b/lib/ansible/modules/source_control/gitlab_user.py @@ -111,7 +111,7 @@ options: version_added: "2.4" isadmin: description: - - Grant admin privilieges to the user + - Grant admin privileges to the user type: bool default: no version_added: "2.8" diff --git a/lib/ansible/modules/system/capabilities.py b/lib/ansible/modules/system/capabilities.py index 307788e230..a7a46f0e7d 100644 --- a/lib/ansible/modules/system/capabilities.py +++ b/lib/ansible/modules/system/capabilities.py @@ -113,7 +113,7 @@ class CapabilitiesModule(object): # '/foo =' # If file xattrs are unset the output will be: # '/foo' - # If the file does not eixst the output will be (with rc == 0...): + # If the file does not exist the output will be (with rc == 0...): # '/foo (No such file or directory)' if rc != 0 or (stdout.strip() != path and stdout.count(' =') != 1): self.module.fail_json(msg="Unable to get capabilities of %s" % path, stdout=stdout.strip(), stderr=stderr) diff --git a/lib/ansible/modules/system/cronvar.py b/lib/ansible/modules/system/cronvar.py index 6f7b564fe4..2969634bec 100644 --- a/lib/ansible/modules/system/cronvar.py +++ b/lib/ansible/modules/system/cronvar.py @@ -372,7 +372,7 @@ def main(): # --- user input validation --- if name is None and ensure_present: - module.fail_json(msg="You must specify 'name' to insert a new cron variabale") + module.fail_json(msg="You must specify 'name' to insert a new cron variable") if value is None and ensure_present: module.fail_json(msg="You must specify 'value' to insert a new cron variable") diff --git a/lib/ansible/modules/system/mount.py b/lib/ansible/modules/system/mount.py index d77a1ee5be..b270f8dee9 100644 --- a/lib/ansible/modules/system/mount.py +++ b/lib/ansible/modules/system/mount.py @@ -556,7 +556,7 @@ def get_linux_mounts(module, mntinfo_file="/proc/self/mountinfo"): if ( len(m['root']) > 1 and mnt['root'].startswith("%s/" % m['root'])): - # Ommit the parent's root in the child's root + # Omit the parent's root in the child's root # == Example: # 140 136 253:2 /rootfs / rw - ext4 /dev/sdb2 rw # 141 140 253:2 /rootfs/tmp/aaa /tmp/bbb rw - ext4 /dev/sdb2 rw diff --git a/lib/ansible/modules/system/open_iscsi.py b/lib/ansible/modules/system/open_iscsi.py index f4ddb686bb..575fac77ac 100644 --- a/lib/ansible/modules/system/open_iscsi.py +++ b/lib/ansible/modules/system/open_iscsi.py @@ -95,7 +95,7 @@ EXAMPLES = r''' login: yes target: iqn.1986-03.com.sun:02:f8c1f9e0-c3ec-ec84-c9c9-8bfb0cd5de3d -- name: Discconnect from the cached named target +- name: Disconnect from the cached named target open_iscsi: login: no target: iqn.1986-03.com.sun:02:f8c1f9e0-c3ec-ec84-c9c9-8bfb0cd5de3d diff --git a/lib/ansible/modules/system/pamd.py b/lib/ansible/modules/system/pamd.py index d55c0126b4..0d8e32b5ae 100644 --- a/lib/ansible/modules/system/pamd.py +++ b/lib/ansible/modules/system/pamd.py @@ -605,7 +605,7 @@ class PamdService(object): if next_rule is not None and not next_rule.matches(new_type, new_control, new_path): # If the previous rule doesn't match we'll insert our new rule. - # Second set the original next rule's previuous to the new_rule + # Second set the original next rule's previous to the new_rule next_rule.prev = new_rule # Third, set the new_rule's next to the original next rule new_rule.next = next_rule @@ -810,7 +810,7 @@ def main(): file %s with error %s.' % (fname, str(e))) - # Assuming we didnt fail, create the service + # Assuming we didn't fail, create the service service = PamdService(content) # Set the action action = module.params['state'] diff --git a/lib/ansible/modules/system/python_requirements_info.py b/lib/ansible/modules/system/python_requirements_info.py index d381a06419..820a9d5d60 100644 --- a/lib/ansible/modules/system/python_requirements_info.py +++ b/lib/ansible/modules/system/python_requirements_info.py @@ -84,7 +84,7 @@ not_found: type: dict sample: - boto4 - - riquests + - requests ''' import re diff --git a/lib/ansible/modules/system/setup.py b/lib/ansible/modules/system/setup.py index cea3c8ed05..9cd342a1f4 100644 --- a/lib/ansible/modules/system/setup.py +++ b/lib/ansible/modules/system/setup.py @@ -82,7 +82,7 @@ notes: output of your scripts. This option was added in Ansible 2.1. - This module is also supported for Windows targets. - - This module should be run with elevated priviliges on BSD systems to gather facts like ansible_product_version. + - This module should be run with elevated privileges on BSD systems to gather facts like ansible_product_version. author: - "Ansible Core Team" - "Michael DeHaan" diff --git a/lib/ansible/modules/system/sysctl.py b/lib/ansible/modules/system/sysctl.py index 443367dca4..937513974b 100644 --- a/lib/ansible/modules/system/sysctl.py +++ b/lib/ansible/modules/system/sysctl.py @@ -149,7 +149,7 @@ class SysctlModule(object): # get the current proc fs value self.proc_value = self.get_token_curr_value(thisname) - # get the currect sysctl file value + # get the current sysctl file value self.read_sysctl_file() if thisname not in self.file_values: self.file_values[thisname] = None diff --git a/lib/ansible/modules/system/sysvinit.py b/lib/ansible/modules/system/sysvinit.py index 07a8c6fc89..9de88726bb 100644 --- a/lib/ansible/modules/system/sysvinit.py +++ b/lib/ansible/modules/system/sysvinit.py @@ -59,7 +59,7 @@ options: type: bool description: - Have the module daemonize as the service itself might not do so properly. - - This is useful with badly written init scripts or deamons, which + - This is useful with badly written init scripts or daemons, which commonly manifests as the task hanging as it is still holding the tty or the service dying when the task is over as the connection closes the session. diff --git a/lib/ansible/modules/windows/win_audit_policy_system.ps1 b/lib/ansible/modules/windows/win_audit_policy_system.ps1 index e58986f142..f21e63e779 100644 --- a/lib/ansible/modules/windows/win_audit_policy_system.ps1 +++ b/lib/ansible/modules/windows/win_audit_policy_system.ps1 @@ -116,7 +116,7 @@ Switch ($audit_type_string) $CurrentRule = Get-AuditPolicy $GetString -#exit if the audit_type is already set properly for the categroy +#exit if the audit_type is already set properly for the category If (-not ($CurrentRule.Values | Where-Object {$_ -ne $audit_type_check}) ) { $results.current_audit_policy = Get-AuditPolicy $GetString diff --git a/lib/ansible/modules/windows/win_certificate_store.ps1 b/lib/ansible/modules/windows/win_certificate_store.ps1 index 0fdace21bb..db984130e7 100644 --- a/lib/ansible/modules/windows/win_certificate_store.ps1 +++ b/lib/ansible/modules/windows/win_certificate_store.ps1 @@ -73,7 +73,7 @@ Function New-CertFile($module, $cert, $path, $type, $password) { $missing_key = $true } if ($missing_key) { - $module.FailJson("Cannot export cert with key as PKCS12 when the key is not marked as exportable or not accesible by the current user") + $module.FailJson("Cannot export cert with key as PKCS12 when the key is not marked as exportable or not accessible by the current user") } } diff --git a/lib/ansible/modules/windows/win_chocolatey_facts.py b/lib/ansible/modules/windows/win_chocolatey_facts.py index 0e9ae2b6b7..581ec2fbaa 100644 --- a/lib/ansible/modules/windows/win_chocolatey_facts.py +++ b/lib/ansible/modules/windows/win_chocolatey_facts.py @@ -128,7 +128,7 @@ ansible_facts: sample: username packages: description: List of installed Packages - returned: alway + returned: always type: complex contains: package: diff --git a/lib/ansible/modules/windows/win_domain_group.ps1 b/lib/ansible/modules/windows/win_domain_group.ps1 index 1bbd2065d0..b392c52c49 100644 --- a/lib/ansible/modules/windows/win_domain_group.ps1 +++ b/lib/ansible/modules/windows/win_domain_group.ps1 @@ -88,7 +88,7 @@ if ($state -eq "absent") { $diff_text = $null if ($null -ne $group) { - # will be overriden later if no change actually occurs + # will be overridden later if no change actually occurs $diff_text += "[$name]`n" # change the path of the group @@ -237,7 +237,7 @@ if ($state -eq "absent") { } } - # make sure our diff text is null if no change occured + # make sure our diff text is null if no change occurred if ($result.changed -eq $false) { $diff_text = $null } diff --git a/lib/ansible/modules/windows/win_domain_group.py b/lib/ansible/modules/windows/win_domain_group.py index 641933233c..7a8792c1ad 100644 --- a/lib/ansible/modules/windows/win_domain_group.py +++ b/lib/ansible/modules/windows/win_domain_group.py @@ -126,7 +126,7 @@ EXAMPLES = r''' scope: global path: OU=groups,DC=ansible,DC=local -- name: Ensure the group Cow does't exist using the Distinguished Name +- name: Ensure the group Cow doesn't exist using the Distinguished Name win_domain_group: name: CN=Cow,OU=groups,DC=ansible,DC=local state: absent diff --git a/lib/ansible/modules/windows/win_domain_user.ps1 b/lib/ansible/modules/windows/win_domain_user.ps1 index 9031426f5b..1bc8ceeed8 100644 --- a/lib/ansible/modules/windows/win_domain_user.ps1 +++ b/lib/ansible/modules/windows/win_domain_user.ps1 @@ -153,7 +153,7 @@ If ($state -eq 'present') { } If ($password) { - # Don't uncecessary check for working credentials. + # Don't unnecessary check for working credentials. # Set the password if we need to. # For new_users there is also no difference between always and when_changed # so we don't need to differentiate between this two states. diff --git a/lib/ansible/modules/windows/win_find.py b/lib/ansible/modules/windows/win_find.py index 267ce9092c..387969e217 100644 --- a/lib/ansible/modules/windows/win_find.py +++ b/lib/ansible/modules/windows/win_find.py @@ -76,7 +76,7 @@ options: description: - One or more (powershell or regex) patterns to compare filenames with. - The type of pattern matching is controlled by C(use_regex) option. - - The patterns retrict the list of files or folders to be returned based on the filenames. + - The patterns restrict the list of files or folders to be returned based on the filenames. - For a file to be matched it only has to match with one pattern in a list provided. type: list aliases: [ "regex", "regexp" ] diff --git a/lib/ansible/modules/windows/win_inet_proxy.py b/lib/ansible/modules/windows/win_inet_proxy.py index 417c774f9a..8a3449f399 100644 --- a/lib/ansible/modules/windows/win_inet_proxy.py +++ b/lib/ansible/modules/windows/win_inet_proxy.py @@ -57,7 +57,7 @@ options: - The name of the IE connection to set the proxy settings for. - These are the connections under the I(Dial-up and Virtual Private Network) header in the IE settings. - - When ommited, the default LAN connection is used. + - When omitted, the default LAN connection is used. type: str proxy: description: diff --git a/lib/ansible/modules/windows/win_package.py b/lib/ansible/modules/windows/win_package.py index 2df7905ad4..c119906983 100644 --- a/lib/ansible/modules/windows/win_package.py +++ b/lib/ansible/modules/windows/win_package.py @@ -41,7 +41,7 @@ options: version_added: '2.8' creates_path: description: - - Will check the existance of the path specified and use the result to + - Will check the existence of the path specified and use the result to determine whether the package is already installed. - You can use this in conjunction with C(product_id) and other C(creates_*). type: path @@ -248,7 +248,7 @@ log: sample: Installation completed successfully rc: description: The return code of the package process. - returned: change occured + returned: change occurred type: int sample: 0 reboot_required: diff --git a/lib/ansible/modules/windows/win_path.py b/lib/ansible/modules/windows/win_path.py index 3117033b3e..6404504fa2 100644 --- a/lib/ansible/modules/windows/win_path.py +++ b/lib/ansible/modules/windows/win_path.py @@ -48,7 +48,7 @@ options: choices: [ machine, user ] default: machine notes: - - This module is for modifying indidvidual elements of path-like + - This module is for modifying individual elements of path-like environment variables. For general-purpose management of other environment vars, use the M(win_environment) module. - This module does not broadcast change events. diff --git a/lib/ansible/modules/windows/win_pester.py b/lib/ansible/modules/windows/win_pester.py index 87b718c3d9..567c847509 100644 --- a/lib/ansible/modules/windows/win_pester.py +++ b/lib/ansible/modules/windows/win_pester.py @@ -29,7 +29,7 @@ options: tags: description: - Runs only tests in Describe blocks with specified Tags values. - - Accepts multiple comma seperated tags. + - Accepts multiple comma separated tags. type: list version_added: '2.9' test_parameters: diff --git a/lib/ansible/modules/windows/win_rds_rap.py b/lib/ansible/modules/windows/win_rds_rap.py index b194b6184c..c6e60be102 100644 --- a/lib/ansible/modules/windows/win_rds_rap.py +++ b/lib/ansible/modules/windows/win_rds_rap.py @@ -36,7 +36,7 @@ options: default: present description: description: - - Optionnal description of the resource authorization policy. + - Optional description of the resource authorization policy. type: str user_groups: description: diff --git a/lib/ansible/modules/windows/win_robocopy.py b/lib/ansible/modules/windows/win_robocopy.py index c30b94c64d..f652f151a3 100644 --- a/lib/ansible/modules/windows/win_robocopy.py +++ b/lib/ansible/modules/windows/win_robocopy.py @@ -140,7 +140,7 @@ output: type: str sample: "------------------------------------\\n ROBOCOPY :: Robust File Copy for Windows \\n------------------------------------\\n " msg: - description: Output intrepreted into a concise message. + description: Output interpreted into a concise message. returned: always type: str sample: No files copied! diff --git a/lib/ansible/modules/windows/win_say.py b/lib/ansible/modules/windows/win_say.py index b0ce27258a..877fe4f913 100644 --- a/lib/ansible/modules/windows/win_say.py +++ b/lib/ansible/modules/windows/win_say.py @@ -28,7 +28,7 @@ options: type: str msg_file: description: - - Full path to a windows format text file containing the text to be spokend. + - Full path to a windows format text file containing the text to be spoken. - Use either C(msg) or C(msg_file). - Optional so that you can use this module just to play sounds. type: path diff --git a/lib/ansible/modules/windows/win_scheduled_task.py b/lib/ansible/modules/windows/win_scheduled_task.py index 58ad48ff9f..afee0c6bbb 100644 --- a/lib/ansible/modules/windows/win_scheduled_task.py +++ b/lib/ansible/modules/windows/win_scheduled_task.py @@ -273,7 +273,7 @@ options: version_added: '2.4' update_password: description: - - Whether to update the password even when not other changes have occured. + - Whether to update the password even when not other changes have occurred. - When C(yes) will always result in a change when executing the module. type: bool default: yes diff --git a/lib/ansible/modules/windows/win_scheduled_task_stat.py b/lib/ansible/modules/windows/win_scheduled_task_stat.py index 428bd72721..1c450c4040 100644 --- a/lib/ansible/modules/windows/win_scheduled_task_stat.py +++ b/lib/ansible/modules/windows/win_scheduled_task_stat.py @@ -288,12 +288,12 @@ settings: type: bool sample: true use_unified_scheduling_engine: - description: Whether the task will use the unifed scheduling engine. + description: Whether the task will use the unified scheduling engine. returned: '' type: bool sample: false volatile: - description: Whether thet ask is volatile. + description: Whether the task is volatile. returned: '' type: bool sample: false diff --git a/lib/ansible/modules/windows/win_toast.ps1 b/lib/ansible/modules/windows/win_toast.ps1 index 51cff7fe6c..e993651521 100644 --- a/lib/ansible/modules/windows/win_toast.ps1 +++ b/lib/ansible/modules/windows/win_toast.ps1 @@ -78,7 +78,7 @@ if ((Get-Process -Name explorer -ErrorAction SilentlyContinue).Count -gt 0){ } } else { $result.toast_sent = $false - $result.no_toast_sent_reason = 'No logged in users to notifiy' + $result.no_toast_sent_reason = 'No logged in users to notify' } $endsend_at = Get-Date | Out-String diff --git a/lib/ansible/modules/windows/win_toast.py b/lib/ansible/modules/windows/win_toast.py index 355a3db1c7..5bb28c8ebb 100644 --- a/lib/ansible/modules/windows/win_toast.py +++ b/lib/ansible/modules/windows/win_toast.py @@ -76,7 +76,7 @@ EXAMPLES = r''' RETURN = r''' expire_at_utc: description: Calculated utc date time when the notification expires. - returned: allways + returned: always type: str sample: 07 July 2017 04:50:54 no_toast_sent_reason: @@ -86,17 +86,17 @@ no_toast_sent_reason: sample: No logged in users to notify sent_localtime: description: local date time when the notification was sent. - returned: allways + returned: always type: str sample: 07 July 2017 05:45:54 time_taken: description: How long the module took to run on the remote windows host in seconds. - returned: allways + returned: always type: float sample: 0.3706631999999997 toast_sent: description: Whether the module was able to send a toast notification or not. - returned: allways + returned: always type: bool sample: false ''' diff --git a/lib/ansible/modules/windows/win_wait_for_process.py b/lib/ansible/modules/windows/win_wait_for_process.py index a1e062f77c..168a914b3c 100644 --- a/lib/ansible/modules/windows/win_wait_for_process.py +++ b/lib/ansible/modules/windows/win_wait_for_process.py @@ -65,7 +65,7 @@ options: description: - When checking for a running process C(present) will block execution until the process exists, or until the timeout has been reached. - C(absent) will block execution untile the processs no longer exists, + C(absent) will block execution until the process no longer exists, or until the timeout has been reached. - When waiting for C(present), the module will return changed only if the process was not present on the initial check but became present on diff --git a/lib/ansible/modules/windows/win_whoami.py b/lib/ansible/modules/windows/win_whoami.py index 9327043649..d647374b6c 100644 --- a/lib/ansible/modules/windows/win_whoami.py +++ b/lib/ansible/modules/windows/win_whoami.py @@ -178,7 +178,7 @@ rights: "SeRemoteInteractiveLogonRight" ] logon_server: - description: The name of the server used to authentcate the owner of the + description: The name of the server used to authenticate the owner of the logon session. returned: success type: str diff --git a/test/integration/targets/win_certificate_store/tasks/test.yml b/test/integration/targets/win_certificate_store/tasks/test.yml index 8663424c06..05e6717162 100644 --- a/test/integration/targets/win_certificate_store/tasks/test.yml +++ b/test/integration/targets/win_certificate_store/tasks/test.yml @@ -798,4 +798,4 @@ file_type: pkcs12 vars: *become_vars register: fail_export_non_exportable - failed_when: fail_export_non_exportable.msg != 'Cannot export cert with key as PKCS12 when the key is not marked as exportable or not accesible by the current user' + failed_when: fail_export_non_exportable.msg != 'Cannot export cert with key as PKCS12 when the key is not marked as exportable or not accessible by the current user' diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 56c7dd4a6c..1f53d82028 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -2344,7 +2344,6 @@ lib/ansible/modules/monitoring/logentries.py validate-modules:parameter-type-not lib/ansible/modules/monitoring/logentries.py validate-modules:doc-missing-type lib/ansible/modules/monitoring/logicmonitor.py validate-modules:no-default-for-required-parameter lib/ansible/modules/monitoring/logicmonitor.py validate-modules:doc-default-does-not-match-spec -lib/ansible/modules/monitoring/logicmonitor.py validate-modules:doc-choices-do-not-match-spec lib/ansible/modules/monitoring/logicmonitor.py validate-modules:parameter-type-not-in-doc lib/ansible/modules/monitoring/logicmonitor.py validate-modules:doc-missing-type lib/ansible/modules/monitoring/logicmonitor_facts.py validate-modules:no-default-for-required-parameter |