spelling fixes (non-trivial, changing messages) (#25094)
Multiple spell fixes in single commit. Taking over existing PR as per comment - https://github.com/ansible/ansible/pull/23645#issuecomment-304312275 Original Author: klemens <ka7@github.com> Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
parent
9d8aa43c67
commit
07be5f2b67
25 changed files with 36 additions and 36 deletions
|
@ -107,7 +107,7 @@ class PullCLI(CLI):
|
||||||
self.parser.add_option('--track-subs', dest='tracksubs', default=False, action='store_true',
|
self.parser.add_option('--track-subs', dest='tracksubs', default=False, action='store_true',
|
||||||
help='submodules will track the latest changes. This is equivalent to specifying the --remote flag to git submodule update')
|
help='submodules will track the latest changes. This is equivalent to specifying the --remote flag to git submodule update')
|
||||||
|
|
||||||
# for pull we don't wan't a default
|
# for pull we don't want a default
|
||||||
self.parser.set_defaults(inventory=None)
|
self.parser.set_defaults(inventory=None)
|
||||||
|
|
||||||
super(PullCLI, self).parse()
|
super(PullCLI, self).parse()
|
||||||
|
@ -129,7 +129,7 @@ class PullCLI(CLI):
|
||||||
raise AnsibleOptionsError("URL for repository not specified, use -h for help")
|
raise AnsibleOptionsError("URL for repository not specified, use -h for help")
|
||||||
|
|
||||||
if self.options.module_name not in self.SUPPORTED_REPO_MODULES:
|
if self.options.module_name not in self.SUPPORTED_REPO_MODULES:
|
||||||
raise AnsibleOptionsError("Unsuported repo module %s, choices are %s" % (self.options.module_name, ','.join(self.SUPPORTED_REPO_MODULES)))
|
raise AnsibleOptionsError("Unsupported repo module %s, choices are %s" % (self.options.module_name, ','.join(self.SUPPORTED_REPO_MODULES)))
|
||||||
|
|
||||||
display.verbosity = self.options.verbosity
|
display.verbosity = self.options.verbosity
|
||||||
self.validate_conflicts(vault_opts=True)
|
self.validate_conflicts(vault_opts=True)
|
||||||
|
|
|
@ -158,7 +158,7 @@ def do_load_resource(module, collection, name):
|
||||||
try:
|
try:
|
||||||
item = find_collection_item(collection, name, '')
|
item = find_collection_item(collection, name, '')
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="Ans error occured while running 'find_collection_item'")
|
module.fail_json(msg="An error occurred while running 'find_collection_item'")
|
||||||
|
|
||||||
if item.exists:
|
if item.exists:
|
||||||
module.exit_json( changed=False,
|
module.exit_json( changed=False,
|
||||||
|
|
|
@ -199,7 +199,7 @@ errorDict = {0: 'Success',
|
||||||
265: 'Invalid Spanning tree vlan options',
|
265: 'Invalid Spanning tree vlan options',
|
||||||
266: 'Invalid IPv6 option',
|
266: 'Invalid IPv6 option',
|
||||||
267: 'Invalid IPV6 neighbor IP Address',
|
267: 'Invalid IPV6 neighbor IP Address',
|
||||||
268: 'Invalid IPV6 neighbor mac addres',
|
268: 'Invalid IPV6 neighbor mac address',
|
||||||
269: 'Invalid IPV6 dhcp option',
|
269: 'Invalid IPV6 dhcp option',
|
||||||
270: 'Invalid IPV6 relay address option',
|
270: 'Invalid IPV6 relay address option',
|
||||||
271: 'Invalid IPV6 Ethernet option',
|
271: 'Invalid IPV6 Ethernet option',
|
||||||
|
|
|
@ -180,7 +180,7 @@ def copy_image(module, ec2):
|
||||||
|
|
||||||
module.exit_json(changed=True, image_id=image_id)
|
module.exit_json(changed=True, image_id=image_id)
|
||||||
except WaiterError as we:
|
except WaiterError as we:
|
||||||
module.fail_json(msg='An error occured waiting for the image to become available. (%s)' % we.reason)
|
module.fail_json(msg='An error occurred waiting for the image to become available. (%s)' % we.reason)
|
||||||
except ClientError as ce:
|
except ClientError as ce:
|
||||||
module.fail_json(msg=ce.message)
|
module.fail_json(msg=ce.message)
|
||||||
except NoCredentialsError:
|
except NoCredentialsError:
|
||||||
|
|
|
@ -701,7 +701,7 @@ class AzureRMSecurityGroup(AzureRMModuleBase):
|
||||||
parameters)
|
parameters)
|
||||||
result = self.get_poller_result(poller)
|
result = self.get_poller_result(poller)
|
||||||
except AzureHttpError as exc:
|
except AzureHttpError as exc:
|
||||||
self.fail("Error creating/upating security group {0} - {1}".format(self.name, str(exc)))
|
self.fail("Error creating/updating security group {0} - {1}".format(self.name, str(exc)))
|
||||||
return create_network_security_group_dict(result)
|
return create_network_security_group_dict(result)
|
||||||
|
|
||||||
def delete(self):
|
def delete(self):
|
||||||
|
|
|
@ -251,11 +251,11 @@ class AnsibleCloudStackIso(AnsibleCloudStack):
|
||||||
args['ispublic'] = self.module.params.get('is_public')
|
args['ispublic'] = self.module.params.get('is_public')
|
||||||
|
|
||||||
if args['bootable'] and not args['ostypeid']:
|
if args['bootable'] and not args['ostypeid']:
|
||||||
self.module.fail_json(msg="OS type 'os_type' is requried if 'bootable=true'.")
|
self.module.fail_json(msg="OS type 'os_type' is required if 'bootable=true'.")
|
||||||
|
|
||||||
args['url'] = self.module.params.get('url')
|
args['url'] = self.module.params.get('url')
|
||||||
if not args['url']:
|
if not args['url']:
|
||||||
self.module.fail_json(msg="URL is requried.")
|
self.module.fail_json(msg="URL is required.")
|
||||||
|
|
||||||
self.result['changed'] = True
|
self.result['changed'] = True
|
||||||
if not self.module.check_mode:
|
if not self.module.check_mode:
|
||||||
|
|
|
@ -23,7 +23,7 @@ DOCUMENTATION = '''
|
||||||
---
|
---
|
||||||
module: gce_instance_template
|
module: gce_instance_template
|
||||||
version_added: "2.3"
|
version_added: "2.3"
|
||||||
short_description: create or destroy intance templates of Compute Engine of GCP.
|
short_description: create or destroy instance templates of Compute Engine of GCP.
|
||||||
description:
|
description:
|
||||||
- Creates or destroy Google instance templates
|
- Creates or destroy Google instance templates
|
||||||
of Compute Engine of Google Cloud Platform.
|
of Compute Engine of Google Cloud Platform.
|
||||||
|
@ -87,7 +87,7 @@ options:
|
||||||
If C(ephemeral), a new non-static address will be
|
If C(ephemeral), a new non-static address will be
|
||||||
used. If C(None), then no external address will
|
used. If C(None), then no external address will
|
||||||
be used. To use an existing static IP address
|
be used. To use an existing static IP address
|
||||||
specify adress name.
|
specify address name.
|
||||||
default: "ephemeral"
|
default: "ephemeral"
|
||||||
service_account_email:
|
service_account_email:
|
||||||
description:
|
description:
|
||||||
|
@ -495,7 +495,7 @@ def check_if_system_state_would_be_changed(module, gce):
|
||||||
output = 'nothing to do for instance template {} '.format(name)
|
output = 'nothing to do for instance template {} '.format(name)
|
||||||
if current_state == "present":
|
if current_state == "present":
|
||||||
if changed:
|
if changed:
|
||||||
output = 'instance template {} will be detroyed'.format(name)
|
output = 'instance template {} will be destroyed'.format(name)
|
||||||
else:
|
else:
|
||||||
output = 'nothing to do for instance template {} '.format(name)
|
output = 'nothing to do for instance template {} '.format(name)
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ options:
|
||||||
upload_image_path:
|
upload_image_path:
|
||||||
description:
|
description:
|
||||||
- "Path to disk image, which should be uploaded."
|
- "Path to disk image, which should be uploaded."
|
||||||
- "Note that currently we support only compability version 0.10 of the qcow disk."
|
- "Note that currently we support only compatibility version 0.10 of the qcow disk."
|
||||||
- "Note that you must have an valid oVirt/RHV engine CA in your system trust store
|
- "Note that you must have an valid oVirt/RHV engine CA in your system trust store
|
||||||
or you must provide it in C(ca_file) parameter."
|
or you must provide it in C(ca_file) parameter."
|
||||||
- "Note that there is no reliable way to achieve idempotency, so
|
- "Note that there is no reliable way to achieve idempotency, so
|
||||||
|
@ -308,7 +308,7 @@ def transfer(connection, module, direction, transfer_func):
|
||||||
otypes.ImageTransferPhase.CANCELLED,
|
otypes.ImageTransferPhase.CANCELLED,
|
||||||
]:
|
]:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
"Error occured while uploading image. The transfer is in %s" % transfer.phase
|
"Error occurred while uploading image. The transfer is in %s" % transfer.phase
|
||||||
)
|
)
|
||||||
if module.params.get('logical_unit'):
|
if module.params.get('logical_unit'):
|
||||||
disks_service = connection.system_service().disks_service()
|
disks_service = connection.system_service().disks_service()
|
||||||
|
|
|
@ -947,7 +947,7 @@ class Collector(LogicMonitor):
|
||||||
installer = self.get_installer_binary()
|
installer = self.get_installer_binary()
|
||||||
|
|
||||||
if self.info is None:
|
if self.info is None:
|
||||||
self.module.debug("Retriving collector information")
|
self.module.debug("Retrieving collector information")
|
||||||
self.info = self._get()
|
self.info = self._get()
|
||||||
|
|
||||||
if not os.path.exists(self.installdir + "/agent"):
|
if not os.path.exists(self.installdir + "/agent"):
|
||||||
|
|
|
@ -98,7 +98,7 @@ EXAMPLES = '''
|
||||||
- Example group1
|
- Example group1
|
||||||
- Example group2
|
- Example group2
|
||||||
|
|
||||||
# Limit the Zabbix group creations to one host since Zabbix can return an error when doing concurent updates
|
# Limit the Zabbix group creations to one host since Zabbix can return an error when doing concurrent updates
|
||||||
- name: Create host groups
|
- name: Create host groups
|
||||||
local_action:
|
local_action:
|
||||||
module: zabbix_group
|
module: zabbix_group
|
||||||
|
@ -180,7 +180,7 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
if not HAS_ZABBIX_API:
|
if not HAS_ZABBIX_API:
|
||||||
module.fail_json(msg="Missing requried zabbix-api module (check docs or install with: pip install zabbix-api)")
|
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
|
||||||
|
|
||||||
server_url = module.params['server_url']
|
server_url = module.params['server_url']
|
||||||
login_user = module.params['login_user']
|
login_user = module.params['login_user']
|
||||||
|
|
|
@ -451,7 +451,7 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
if not HAS_ZABBIX_API:
|
if not HAS_ZABBIX_API:
|
||||||
module.fail_json(msg="Missing requried zabbix-api module (check docs or install with: pip install zabbix-api)")
|
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
|
||||||
|
|
||||||
server_url = module.params['server_url']
|
server_url = module.params['server_url']
|
||||||
login_user = module.params['login_user']
|
login_user = module.params['login_user']
|
||||||
|
|
|
@ -199,7 +199,7 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
if not HAS_ZABBIX_API:
|
if not HAS_ZABBIX_API:
|
||||||
module.fail_json(msg="Missing requried zabbix-api module (check docs or install with: pip install zabbix-api)")
|
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
|
||||||
|
|
||||||
server_url = module.params['server_url']
|
server_url = module.params['server_url']
|
||||||
login_user = module.params['login_user']
|
login_user = module.params['login_user']
|
||||||
|
|
|
@ -299,7 +299,7 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
if not HAS_ZABBIX_API:
|
if not HAS_ZABBIX_API:
|
||||||
module.fail_json(msg="Missing requried zabbix-api module (check docs or install with: pip install zabbix-api)")
|
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
|
||||||
|
|
||||||
host_names = module.params['host_names']
|
host_names = module.params['host_names']
|
||||||
host_groups = module.params['host_groups']
|
host_groups = module.params['host_groups']
|
||||||
|
|
|
@ -126,7 +126,7 @@ EXAMPLES = '''
|
||||||
graph_width: 200
|
graph_width: 200
|
||||||
graph_height: 100
|
graph_height: 100
|
||||||
|
|
||||||
# Limit the Zabbix screen creations to one host since Zabbix can return an error when doing concurent updates
|
# Limit the Zabbix screen creations to one host since Zabbix can return an error when doing concurrent updates
|
||||||
- name: Create a new screen or update an existing screen's items
|
- name: Create a new screen or update an existing screen's items
|
||||||
local_action:
|
local_action:
|
||||||
module: zabbix_screen
|
module: zabbix_screen
|
||||||
|
@ -345,7 +345,7 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
if not HAS_ZABBIX_API:
|
if not HAS_ZABBIX_API:
|
||||||
module.fail_json(msg="Missing requried zabbix-api module (check docs or install with: pip install zabbix-api)")
|
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
|
||||||
|
|
||||||
server_url = module.params['server_url']
|
server_url = module.params['server_url']
|
||||||
login_user = module.params['login_user']
|
login_user = module.params['login_user']
|
||||||
|
|
|
@ -203,7 +203,7 @@ def asn_pool_absent(module, aos, my_pool):
|
||||||
try:
|
try:
|
||||||
my_pool.delete()
|
my_pool.delete()
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured, while trying to delete the ASN Pool")
|
module.fail_json(msg="An error occurred, while trying to delete the ASN Pool")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_pool.name,
|
name=my_pool.name,
|
||||||
|
@ -234,7 +234,7 @@ def asn_pool_present(module, aos, my_pool):
|
||||||
my_new_pool = create_new_asn_pool(my_pool, margs['name'], margs['ranges'])
|
my_new_pool = create_new_asn_pool(my_pool, margs['name'], margs['ranges'])
|
||||||
my_pool = my_new_pool
|
my_pool = my_new_pool
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured while trying to create a new ASN Pool ")
|
module.fail_json(msg="An error occurred while trying to create a new ASN Pool ")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_pool.name,
|
name=my_pool.name,
|
||||||
|
|
|
@ -183,7 +183,7 @@ def ext_router_absent(module, aos, my_ext_router):
|
||||||
time.sleep(2)
|
time.sleep(2)
|
||||||
my_ext_router.delete()
|
my_ext_router.delete()
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured, while trying to delete the External Router")
|
module.fail_json(msg="An error occurred, while trying to delete the External Router")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_ext_router.name,
|
name=my_ext_router.name,
|
||||||
|
@ -213,7 +213,7 @@ def ext_router_present(module, aos, my_ext_router):
|
||||||
margs['asn'] )
|
margs['asn'] )
|
||||||
my_ext_router = my_new_ext_router
|
my_ext_router = my_new_ext_router
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured while trying to create a new External Router")
|
module.fail_json(msg="An error occurred while trying to create a new External Router")
|
||||||
|
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
|
|
|
@ -211,7 +211,7 @@ def ip_pool_absent(module, aos, my_pool):
|
||||||
try:
|
try:
|
||||||
my_pool.delete()
|
my_pool.delete()
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured, while trying to delete the IP Pool")
|
module.fail_json(msg="An error occurred, while trying to delete the IP Pool")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_pool.name,
|
name=my_pool.name,
|
||||||
|
@ -246,7 +246,7 @@ def ip_pool_present(module, aos, my_pool):
|
||||||
my_new_pool = create_new_ip_pool(my_pool, margs['name'], margs['subnets'])
|
my_new_pool = create_new_ip_pool(my_pool, margs['name'], margs['subnets'])
|
||||||
my_pool = my_new_pool
|
my_pool = my_new_pool
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured while trying to create a new IP Pool ")
|
module.fail_json(msg="An error occurred while trying to create a new IP Pool ")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_pool.name,
|
name=my_pool.name,
|
||||||
|
|
|
@ -152,7 +152,7 @@ def logical_device_absent(module, aos, my_logical_dev):
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
my_logical_dev.delete()
|
my_logical_dev.delete()
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured, while trying to delete the Logical Device")
|
module.fail_json(msg="An error occurred, while trying to delete the Logical Device")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_logical_dev.name,
|
name=my_logical_dev.name,
|
||||||
|
|
|
@ -149,7 +149,7 @@ def rack_type_absent(module, aos, my_rack_type):
|
||||||
try:
|
try:
|
||||||
my_rack_type.delete()
|
my_rack_type.delete()
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured, while trying to delete the Rack Type")
|
module.fail_json(msg="An error occurred, while trying to delete the Rack Type")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_rack_type.name,
|
name=my_rack_type.name,
|
||||||
|
|
|
@ -161,7 +161,7 @@ def template_absent(module, aos, my_template):
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
my_template.delete()
|
my_template.delete()
|
||||||
except:
|
except:
|
||||||
module.fail_json(msg="An error occured, while trying to delete the Template")
|
module.fail_json(msg="An error occurred, while trying to delete the Template")
|
||||||
|
|
||||||
module.exit_json( changed=True,
|
module.exit_json( changed=True,
|
||||||
name=my_template.name,
|
name=my_template.name,
|
||||||
|
|
|
@ -239,7 +239,7 @@ def main():
|
||||||
# When an tap URL is provided explicitly, we allow adding
|
# When an tap URL is provided explicitly, we allow adding
|
||||||
# *single* tap only. Validate and proceed to add single tap.
|
# *single* tap only. Validate and proceed to add single tap.
|
||||||
if len(taps) > 1:
|
if len(taps) > 1:
|
||||||
msg = "List of muliple taps may not be provided with 'url' option."
|
msg = "List of multiple taps may not be provided with 'url' option."
|
||||||
module.fail_json(msg=msg)
|
module.fail_json(msg=msg)
|
||||||
else:
|
else:
|
||||||
failed, changed, msg = add_tap(module, brew_path, taps[0], url)
|
failed, changed, msg = add_tap(module, brew_path, taps[0], url)
|
||||||
|
|
|
@ -570,7 +570,7 @@ class YumRepo(object):
|
||||||
# defined.
|
# defined.
|
||||||
if (self.params['baseurl'], self.params['mirrorlist']) == (None, None):
|
if (self.params['baseurl'], self.params['mirrorlist']) == (None, None):
|
||||||
self.module.fail_json(
|
self.module.fail_json(
|
||||||
msg='Paramater "baseurl" or "mirrorlist" is required for '
|
msg='Parameter "baseurl" or "mirrorlist" is required for '
|
||||||
'adding a new repo.')
|
'adding a new repo.')
|
||||||
|
|
||||||
# Set options
|
# Set options
|
||||||
|
|
|
@ -138,7 +138,7 @@ def _module_is_enabled(module):
|
||||||
if 'AH00534' in stderr and 'mpm_' in name:
|
if 'AH00534' in stderr and 'mpm_' in name:
|
||||||
module.warnings.append(
|
module.warnings.append(
|
||||||
"No MPM module loaded! apache2 reload AND other module actions"
|
"No MPM module loaded! apache2 reload AND other module actions"
|
||||||
" will fail if no MPM module is loaded immediatly."
|
" will fail if no MPM module is loaded immediately."
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
module.warnings.append(error_msg)
|
module.warnings.append(error_msg)
|
||||||
|
|
|
@ -29,11 +29,11 @@ $result = @{
|
||||||
$path = Get-AnsibleParam -obj $params -name "path" -type "path" -failifempty $true -resultobj $result
|
$path = Get-AnsibleParam -obj $params -name "path" -type "path" -failifempty $true -resultobj $result
|
||||||
|
|
||||||
If (-Not (Test-Path -Path $path -PathType Leaf)){
|
If (-Not (Test-Path -Path $path -PathType Leaf)){
|
||||||
Fail-Json $result "Specfied path $path does exist or is not a file."
|
Fail-Json $result "Specified path $path does exist or is not a file."
|
||||||
}
|
}
|
||||||
$ext = [System.IO.Path]::GetExtension($path)
|
$ext = [System.IO.Path]::GetExtension($path)
|
||||||
If ( $ext -notin '.exe', '.dll'){
|
If ( $ext -notin '.exe', '.dll'){
|
||||||
Fail-Json $result "Specfied path $path is not a vaild file type; must be DLL or EXE."
|
Fail-Json $result "Specified path $path is not a vaild file type; must be DLL or EXE."
|
||||||
}
|
}
|
||||||
|
|
||||||
Try {
|
Try {
|
||||||
|
|
|
@ -68,7 +68,7 @@ class ActionModule(ActionBase):
|
||||||
elif isinstance(groups, string_types):
|
elif isinstance(groups, string_types):
|
||||||
group_list = groups.split(",")
|
group_list = groups.split(",")
|
||||||
else:
|
else:
|
||||||
raise AnsibleError("Groups must be specfied as a list.", obj=self._task)
|
raise AnsibleError("Groups must be specified as a list.", obj=self._task)
|
||||||
|
|
||||||
for group_name in group_list:
|
for group_name in group_list:
|
||||||
if group_name not in new_groups:
|
if group_name not in new_groups:
|
||||||
|
|
Loading…
Reference in a new issue