summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Gumprich <rndmh3ro@users.noreply.github.com>2018-03-12 11:00:19 +0100
committerMatt Davis <mrd@redhat.com>2018-03-15 17:57:11 -0700
commit20fcaeb854166feb73255c0a45111e37632fceb7 (patch)
tree3bae82df6b914b53ebebdea49ee6890cd58de151
parent2f8a851b442d4bf49121849b75f91f19cb8917e7 (diff)
downloadansible-20fcaeb854166feb73255c0a45111e37632fceb7.tar.gz
fix spelling mistakes in several modules (#36296)
* fix more spelling mistakes * fix spelling mistakes (cherry picked from commit 16c564c4b4d5ddf6cd10da68129c3f401971b104)
-rw-r--r--lib/ansible/modules/cloud/digital_ocean/digital_ocean_certificate.py2
-rw-r--r--lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py2
-rw-r--r--lib/ansible/modules/cloud/google/gc_storage.py2
-rw-r--r--lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py2
-rw-r--r--lib/ansible/modules/cloud/vmware/vmware_guest.py6
-rw-r--r--lib/ansible/modules/cloud/vmware/vmware_local_role_manager.py2
-rw-r--r--lib/ansible/modules/cloud/vmware/vmware_vm_vm_drs_rule.py2
-rw-r--r--lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py2
-rw-r--r--lib/ansible/modules/monitoring/grafana_dashboard.py6
-rw-r--r--lib/ansible/modules/monitoring/grafana_datasource.py4
-rw-r--r--lib/ansible/modules/network/cloudengine/ce_interface.py8
-rw-r--r--lib/ansible/modules/network/cloudengine/ce_mtu.py2
-rw-r--r--lib/ansible/modules/network/cloudengine/ce_switchport.py4
-rw-r--r--lib/ansible/modules/source_control/gitlab_group.py4
-rw-r--r--lib/ansible/modules/source_control/gitlab_project.py4
-rw-r--r--lib/ansible/modules/source_control/gitlab_user.py4
-rw-r--r--lib/ansible/modules/system/osx_defaults.py2
-rw-r--r--lib/ansible/modules/web_infrastructure/ejabberd_user.py2
-rw-r--r--test/integration/targets/ecs_ecr/tasks/main.yml2
-rw-r--r--test/integration/targets/vmware_guest/tasks/network_negative_test.yml2
-rw-r--r--test/integration/targets/win_dsc/tasks/destructive.yml2
21 files changed, 33 insertions, 33 deletions
diff --git a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_certificate.py b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_certificate.py
index 258d37fc11..11e9ace106 100644
--- a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_certificate.py
+++ b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_certificate.py
@@ -118,7 +118,7 @@ def core(module):
if cert['name'] == name:
module.fail_json(msg="Certificate name %s already exists" % name)
- # Certificate does not exists, let us create it
+ # Certificate does not exist, let us create it
cert_data = dict(name=name,
private_key=module.params['private_key'],
leaf_certificate=module.params['leaf_certificate'])
diff --git a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py
index 30a318520c..15e0a8189c 100644
--- a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py
+++ b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py
@@ -63,7 +63,7 @@ EXAMPLES = '''
name: production
state: present
-- name: tag a resource; creating the tag if it does not exists
+- name: tag a resource; creating the tag if it does not exist
digital_ocean_tag:
name: "{{ item }}"
resource_id: "73333005"
diff --git a/lib/ansible/modules/cloud/google/gc_storage.py b/lib/ansible/modules/cloud/google/gc_storage.py
index d190ca8b7f..a2700a9d2a 100644
--- a/lib/ansible/modules/cloud/google/gc_storage.py
+++ b/lib/ansible/modules/cloud/google/gc_storage.py
@@ -387,7 +387,7 @@ def handle_delete(module, gs, bucket, obj):
if key_check(module, gs, bucket, obj):
module.exit_json(msg="Object has been deleted.", changed=delete_key(module, gs, bucket, obj))
else:
- module.exit_json(msg="Object does not exists.", changed=False)
+ module.exit_json(msg="Object does not exist.", changed=False)
else:
module.exit_json(msg="Bucket does not exist.", changed=False)
else:
diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py
index 96612ac45c..83fa70094d 100644
--- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py
+++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py
@@ -433,7 +433,7 @@ class StorageDomainModule(BaseModule):
# Get data center object of the storage domain:
dcs_service = self._connection.system_service().data_centers_service()
- # Search the data_center name, if it does not exists, try to search by guid.
+ # Search the data_center name, if it does not exist, try to search by guid.
dc = search_by_name(dcs_service, dc_name)
if dc is None:
dc = get_entity(dcs_service.service(dc_name))
diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest.py b/lib/ansible/modules/cloud/vmware/vmware_guest.py
index ed3cb9f909..712a5bb6fa 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_guest.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_guest.py
@@ -910,7 +910,7 @@ class PyVmomiHelper(PyVmomi):
" a VLAN name under VM network list.")
if 'name' in network and find_obj(self.content, [vim.Network], network['name']) is None:
- self.module.fail_json(msg="Network '%(name)s' does not exists" % network)
+ self.module.fail_json(msg="Network '%(name)s' does not exist." % network)
elif 'vlan' in network:
dvps = self.cache.get_all_objs(self.content, [vim.dvs.DistributedVirtualPortgroup])
for dvp in dvps:
@@ -1177,7 +1177,7 @@ class PyVmomiHelper(PyVmomi):
ident.guiRunOnce.commandList = self.params['customization']['runonce']
else:
- # FIXME: We have no clue whether this non-Windows OS is actually Linux, hence it might fail !
+ # FIXME: We have no clue whether this non-Windows OS is actually Linux, hence it might fail!
# For Linux guest OS, use LinuxPrep
# https://pubs.vmware.com/vi3/sdk/ReferenceGuide/vim.vm.customization.LinuxPrep.html
@@ -1196,7 +1196,7 @@ class PyVmomiHelper(PyVmomi):
self.customspec.identity = ident
def get_vm_scsi_controller(self, vm_obj):
- # If vm_obj doesn't exists no SCSI controller to find
+ # If vm_obj doesn't exist there is no SCSI controller to find
if vm_obj is None:
return None
diff --git a/lib/ansible/modules/cloud/vmware/vmware_local_role_manager.py b/lib/ansible/modules/cloud/vmware/vmware_local_role_manager.py
index c437fa786d..4343be5e66 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_local_role_manager.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_local_role_manager.py
@@ -190,7 +190,7 @@ class VMwareLocalRoleManager(PyVmomi):
failIfUsed=self.force)
except vim.fault.NotFound as e:
self.module.fail_json(msg="Failed to remove a role %s as the user specified role name "
- "does not exists." % self.role_name,
+ "does not exist." % self.role_name,
details=e.msg)
except vim.fault.RemoveFailed as e:
msg = "Failed to remove a role %s as the user specified role name." % self.role_name
diff --git a/lib/ansible/modules/cloud/vmware/vmware_vm_vm_drs_rule.py b/lib/ansible/modules/cloud/vmware/vmware_vm_vm_drs_rule.py
index a57ea01072..99255e9f4d 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_vm_vm_drs_rule.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_vm_vm_drs_rule.py
@@ -232,7 +232,7 @@ class VmwareDrs(PyVmomi):
# Create
def create(self):
"""
- Function to create a DRS rule if rule does not exists
+ Function to create a DRS rule if rule does not exist
"""
rule_obj = self.get_rule_key_by_name(rule_name=self.rule_name)
if rule_obj is not None:
diff --git a/lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py b/lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py
index 12af2642c5..f7bc0b9a0e 100644
--- a/lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py
+++ b/lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py
@@ -51,7 +51,7 @@ EXAMPLES = '''
ipa_user: admin
ipa_pass: topsecret
-- name: Ensure sudo command group does not exists
+- name: Ensure sudo command group does not exist
ipa_sudocmdgroup:
name: group01
state: absent
diff --git a/lib/ansible/modules/monitoring/grafana_dashboard.py b/lib/ansible/modules/monitoring/grafana_dashboard.py
index 5fb5add5ab..e351204693 100644
--- a/lib/ansible/modules/monitoring/grafana_dashboard.py
+++ b/lib/ansible/modules/monitoring/grafana_dashboard.py
@@ -242,8 +242,8 @@ def grafana_delete_dashboard(module, data):
else:
raise GrafanaAPIException('Unable to update the dashboard %s : %s' % (data['slug'], info))
else:
- # dashboard does not exists : do nothing
- result = {'msg': "Dashboard %s does not exists" % data['slug'],
+ # dashboard does not exist, do nothing
+ result = {'msg': "Dashboard %s does not exist." % data['slug'],
'changed': False,
'slug': data['slug']}
@@ -274,7 +274,7 @@ def grafana_export_dashboard(module, data):
'slug': data['slug'],
'changed': True}
else:
- result = {'msg': "Dashboard %s does not exists" % data['slug'],
+ result = {'msg': "Dashboard %s does not exist." % data['slug'],
'slug': data['slug'],
'changed': False}
diff --git a/lib/ansible/modules/monitoring/grafana_datasource.py b/lib/ansible/modules/monitoring/grafana_datasource.py
index 98e4ccf23a..3e8acde857 100644
--- a/lib/ansible/modules/monitoring/grafana_datasource.py
+++ b/lib/ansible/modules/monitoring/grafana_datasource.py
@@ -429,8 +429,8 @@ def grafana_delete_datasource(module, data):
else:
raise GrafanaAPIException('Unable to update the datasource id %s : %s' % (ds['id'], info))
else:
- # datasource does not exists : do nothing
- result = {'msg': "Datasource %s does not exists" % data['name'],
+ # datasource does not exist, do nothing
+ result = {'msg': "Datasource %s does not exist." % data['name'],
'changed': False,
'id': 0,
'name': data['name']}
diff --git a/lib/ansible/modules/network/cloudengine/ce_interface.py b/lib/ansible/modules/network/cloudengine/ce_interface.py
index 0e11df4b2c..8e5fdc54f2 100644
--- a/lib/ansible/modules/network/cloudengine/ce_interface.py
+++ b/lib/ansible/modules/network/cloudengine/ce_interface.py
@@ -809,15 +809,15 @@ class Interface(object):
# delete interface
self.delete_interface(self.interface)
else:
- # interface does not exists
+ # interface does not exist
self.module.fail_json(
- msg='Error: interface does not exists.')
+ msg='Error: interface does not exist.')
else: # default
if not self.intf_info:
- # error, interface does not exists
+ # error, interface does not exist
self.module.fail_json(
- msg='Error: interface does not exists.')
+ msg='Error: interface does not exist.')
else:
self.default_interface(self.interface)
diff --git a/lib/ansible/modules/network/cloudengine/ce_mtu.py b/lib/ansible/modules/network/cloudengine/ce_mtu.py
index 9b695bf52f..f32677de97 100644
--- a/lib/ansible/modules/network/cloudengine/ce_mtu.py
+++ b/lib/ansible/modules/network/cloudengine/ce_mtu.py
@@ -472,7 +472,7 @@ class Mtu(object):
# get interface info
self.intf_info = self.get_interface_dict(self.interface)
if not self.intf_info:
- self.module.fail_json(msg='Error: interface does not exists.')
+ self.module.fail_json(msg='Error: interface does not exist.')
# check interface
if self.mtu and self.intf_info['isL2SwitchPort'] == 'true':
diff --git a/lib/ansible/modules/network/cloudengine/ce_switchport.py b/lib/ansible/modules/network/cloudengine/ce_switchport.py
index aa9176b393..865a50c5d8 100644
--- a/lib/ansible/modules/network/cloudengine/ce_switchport.py
+++ b/lib/ansible/modules/network/cloudengine/ce_switchport.py
@@ -719,7 +719,7 @@ class SwitchPort(object):
# get interface info
self.intf_info = self.get_interface_dict(self.interface)
if not self.intf_info:
- self.module.fail_json(msg='Error: Interface does not exists.')
+ self.module.fail_json(msg='Error: Interface does not exist.')
if not self.is_l2switchport():
self.module.fail_json(
@@ -764,7 +764,7 @@ class SwitchPort(object):
self.check_params()
if not self.intf_info:
- self.module.fail_json(msg='Error: interface does not exists.')
+ self.module.fail_json(msg='Error: interface does not exist.')
self.get_existing()
self.get_proposed()
diff --git a/lib/ansible/modules/source_control/gitlab_group.py b/lib/ansible/modules/source_control/gitlab_group.py
index af6a30ab70..c59fdc7f18 100644
--- a/lib/ansible/modules/source_control/gitlab_group.py
+++ b/lib/ansible/modules/source_control/gitlab_group.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
module: gitlab_group
short_description: Creates/updates/deletes Gitlab Groups
description:
- - When the group does not exists in Gitlab, it will be created.
+ - When the group does not exist in Gitlab, it will be created.
- When the group does exists and state=absent, the group will be deleted.
version_added: "2.1"
author: "Werner Dijkerman (@dj-wasabi)"
@@ -209,7 +209,7 @@ def main():
module.exit_json(changed=True, result="Successfully deleted group %s" % group_name)
else:
if state == "absent":
- module.exit_json(changed=False, result="Group deleted or does not exists")
+ module.exit_json(changed=False, result="Group deleted or does not exist")
else:
if group_exists:
module.exit_json(changed=False)
diff --git a/lib/ansible/modules/source_control/gitlab_project.py b/lib/ansible/modules/source_control/gitlab_project.py
index f3f798961b..bb1cfd2e4c 100644
--- a/lib/ansible/modules/source_control/gitlab_project.py
+++ b/lib/ansible/modules/source_control/gitlab_project.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
module: gitlab_project
short_description: Creates/updates/deletes Gitlab Projects
description:
- - When the project does not exists in Gitlab, it will be created.
+ - When the project does not exist in Gitlab, it will be created.
- When the project does exists and state=absent, the project will be deleted.
- When changes are made to the project, the project will be updated.
version_added: "2.1"
@@ -392,7 +392,7 @@ def main():
module.exit_json(changed=True, result="Successfully deleted project %s" % project_name)
else:
if state == "absent":
- module.exit_json(changed=False, result="Project deleted or does not exists")
+ module.exit_json(changed=False, result="Project deleted or does not exist")
else:
if project.createOrUpdateProject(project_exists, group_name, import_url, arguments):
module.exit_json(changed=True, result="Successfully created or updated the project %s" % project_name)
diff --git a/lib/ansible/modules/source_control/gitlab_user.py b/lib/ansible/modules/source_control/gitlab_user.py
index aac1d5586d..52c18f94e2 100644
--- a/lib/ansible/modules/source_control/gitlab_user.py
+++ b/lib/ansible/modules/source_control/gitlab_user.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
module: gitlab_user
short_description: Creates/updates/deletes Gitlab Users
description:
- - When the user does not exists in Gitlab, it will be created.
+ - When the user does not exist in Gitlab, it will be created.
- When the user does exists and state=absent, the user will be deleted.
- When changes are made to user, the user will be updated.
version_added: "2.1"
@@ -352,7 +352,7 @@ def main():
# Check if user exists, if not exists and state = absent, we exit nicely.
if not user.existsUser(user_username) and state == "absent":
- module.exit_json(changed=False, result="User already deleted or does not exists")
+ module.exit_json(changed=False, result="User already deleted or does not exist")
else:
# User exists,
if state == "absent":
diff --git a/lib/ansible/modules/system/osx_defaults.py b/lib/ansible/modules/system/osx_defaults.py
index 74f0361a9a..f5eedd41f4 100644
--- a/lib/ansible/modules/system/osx_defaults.py
+++ b/lib/ansible/modules/system/osx_defaults.py
@@ -236,7 +236,7 @@ class OSXDefaults(object):
# First try to find out the type
rc, out, err = self.module.run_command(self._base_command() + ["read-type", self.domain, self.key])
- # If RC is 1, the key does not exists
+ # If RC is 1, the key does not exist
if rc == 1:
return None
diff --git a/lib/ansible/modules/web_infrastructure/ejabberd_user.py b/lib/ansible/modules/web_infrastructure/ejabberd_user.py
index 3c1ea02f9c..f7c804cf0a 100644
--- a/lib/ansible/modules/web_infrastructure/ejabberd_user.py
+++ b/lib/ansible/modules/web_infrastructure/ejabberd_user.py
@@ -56,7 +56,7 @@ notes:
EXAMPLES = '''
# Example playbook entries using the ejabberd_user module to manage users state.
-- name: create a user if it does not exists
+- name: create a user if it does not exist
ejabberd_user:
username: test
host: server
diff --git a/test/integration/targets/ecs_ecr/tasks/main.yml b/test/integration/targets/ecs_ecr/tasks/main.yml
index 6e95f40683..e223752242 100644
--- a/test/integration/targets/ecs_ecr/tasks/main.yml
+++ b/test/integration/targets/ecs_ecr/tasks/main.yml
@@ -88,7 +88,7 @@
- result is not changed
- - name: When in check mode, and deleting a policy that does not exists
+ - name: When in check mode, and deleting a policy that does not exist
ecs_ecr:
region: '{{ ec2_region }}'
name: '{{ ecr_name }}'
diff --git a/test/integration/targets/vmware_guest/tasks/network_negative_test.yml b/test/integration/targets/vmware_guest/tasks/network_negative_test.yml
index f490d2bed8..aa2be2aa4d 100644
--- a/test/integration/targets/vmware_guest/tasks/network_negative_test.yml
+++ b/test/integration/targets/vmware_guest/tasks/network_negative_test.yml
@@ -65,7 +65,7 @@
assert:
that:
- "not non_existent_network.changed"
- - "\"Network 'Non existent VM' does not exists\" in non_existent_network.msg"
+ - "\"Network 'Non existent VM' does not exist\" in non_existent_network.msg"
- name: create new VMs with network and with only IP
vmware_guest:
diff --git a/test/integration/targets/win_dsc/tasks/destructive.yml b/test/integration/targets/win_dsc/tasks/destructive.yml
index 9616608839..86051fe394 100644
--- a/test/integration/targets/win_dsc/tasks/destructive.yml
+++ b/test/integration/targets/win_dsc/tasks/destructive.yml
@@ -13,7 +13,7 @@
name: xWebAdministration
state: present
-- name: ensure IIS website does not exists
+- name: ensure IIS website does not exist
win_iis_website:
name: Ansible DSC Test
state: absent