Skip to content

Commit 2401154

Browse files
goneriAkasurde
authored andcommitted
VMware: rename VMWare to VMware (ansible#58535)
Follow the nomenclature convention decided in ansible#56814
1 parent 35dcd23 commit 2401154

28 files changed

+48
-48
lines changed

contrib/inventory/vmware_inventory.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ password=vmware
4848
#skip_keys = declaredalarmstate,disabledmethod,dynamicproperty,dynamictype,environmentbrowser,managedby,parent,childtype,resourceconfig
4949

5050

51-
# Host alias for objects in the inventory. VMWare allows duplicate VM names
51+
# Host alias for objects in the inventory. VMware allows duplicate VM names
5252
# so they can not be considered unique. Use this setting to alter the alias
5353
# returned for the hosts. Any atributes for the guest can be used to build
5454
# this alias. The default combines the config name and the config uuid and

docs/docsite/rst/scenario_guides/vmware_scenarios/scenario_clone_template.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Caveats
7373

7474
- Hosts in the ESXi cluster must have access to the datastore that the template resides on.
7575
- Multiple templates with the same name will cause module failures.
76-
- In order to utilize Guest Customization, VMWare Tools must be installed on the template. For Linux, the ``open-vm-tools`` package is recommended, and it requires that ``Perl`` be installed.
76+
- In order to utilize Guest Customization, VMware Tools must be installed on the template. For Linux, the ``open-vm-tools`` package is recommended, and it requires that ``Perl`` be installed.
7777

7878

7979
Example Description

lib/ansible/modules/cloud/cloudstack/cs_iso.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
type: bool
5454
is_dynamically_scalable:
5555
description:
56-
- Register the ISO having XS/VMWare tools installed inorder to support dynamic scaling of VM cpu/memory. Only used if I(state) is present.
56+
- Register the ISO having XS/VMware tools installed inorder to support dynamic scaling of VM cpu/memory. Only used if I(state) is present.
5757
type: bool
5858
checksum:
5959
description:

lib/ansible/modules/cloud/cloudstack/cs_template.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
type: bool
6969
is_dynamically_scalable:
7070
description:
71-
- Register the template having XS/VMWare tools installed in order to support dynamic scaling of VM CPU/memory.
71+
- Register the template having XS/VMware tools installed in order to support dynamic scaling of VM CPU/memory.
7272
- Only used if I(state) is C(present).
7373
type: bool
7474
cross_zones:

lib/ansible/modules/cloud/vmware/vmware_cluster_facts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
module: vmware_cluster_facts
1919
short_description: Gather facts about clusters available in given vCenter
2020
description:
21-
- This module can be used to gather facts about clusters in VMWare infrastructure.
21+
- This module can be used to gather facts about clusters in VMware infrastructure.
2222
- All values and VMware object names are case sensitive.
2323
version_added: '2.6'
2424
author:

lib/ansible/modules/cloud/vmware/vmware_datastore_facts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
module: vmware_datastore_facts
2020
short_description: Gather facts about datastores available in given vCenter
2121
description:
22-
- This module can be used to gather facts about datastores in VMWare infrastructure.
22+
- This module can be used to gather facts about datastores in VMware infrastructure.
2323
- All values and VMware object names are case sensitive.
2424
version_added: 2.5
2525
author:

lib/ansible/modules/cloud/vmware/vmware_guest.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
- Please note that a supplied UUID will be ignored on virtual machine creation, as VMware creates the UUID internally.
8585
use_instance_uuid:
8686
description:
87-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
87+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
8888
default: no
8989
type: bool
9090
version_added: '2.8'
@@ -598,7 +598,7 @@
598598

599599

600600
class PyVmomiDeviceHelper(object):
601-
""" This class is a helper to create easily VMWare Objects for PyVmomiHelper """
601+
""" This class is a helper to create easily VMware Objects for PyVmomiHelper """
602602

603603
def __init__(self, module):
604604
self.module = module
@@ -1333,7 +1333,7 @@ def configure_network(self, vm_obj):
13331333
"The failing new MAC address is %s" % nic.device.macAddress)
13341334

13351335
else:
1336-
# Default device type is vmxnet3, VMWare best practice
1336+
# Default device type is vmxnet3, VMware best practice
13371337
device_type = network_devices[key].get('device_type', 'vmxnet3')
13381338
nic = self.device_helper.create_nic(device_type,
13391339
'Network Adapter %s' % (key + 1),
@@ -1872,7 +1872,7 @@ def configure_disks(self, vm_obj):
18721872
pass
18731873

18741874
kb = self.get_configured_disk_size(expected_disk_spec)
1875-
# VMWare doesn't allow to reduce disk sizes
1875+
# VMware doesn't allow to reduce disk sizes
18761876
if kb < diskspec.device.capacityInKB:
18771877
self.module.fail_json(
18781878
msg="Given disk size is smaller than found (%d < %d). Reducing disks is not allowed." %
@@ -2383,7 +2383,7 @@ def reconfigure_vm(self):
23832383
if task.info.state == 'error':
23842384
return {'changed': self.change_applied, 'failed': True, 'msg': task.info.error.msg, 'op': 'relocate'}
23852385

2386-
# Only send VMWare task if we see a modification
2386+
# Only send VMware task if we see a modification
23872387
if self.change_detected:
23882388
task = None
23892389
try:
@@ -2441,7 +2441,7 @@ def reconfigure_vm(self):
24412441
self.module.fail_json(msg="Failed to convert template to virtual machine"
24422442
" due to generic error : %s" % to_native(generic_exc))
24432443

2444-
# Automatically update VMWare UUID when converting template to VM.
2444+
# Automatically update VMware UUID when converting template to VM.
24452445
# This avoids an interactive prompt during VM startup.
24462446
uuid_action = [x for x in self.current_vm_obj.config.extraConfig if x.key == "uuid.action"]
24472447
if not uuid_action:

lib/ansible/modules/cloud/vmware/vmware_guest_boot_facts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
- This is required if C(name) parameter is not supplied.
4141
use_instance_uuid:
4242
description:
43-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
43+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4444
default: no
4545
type: bool
4646
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_boot_manager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
- This is required if C(name) parameter is not supplied.
4141
use_instance_uuid:
4242
description:
43-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
43+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4444
default: no
4545
type: bool
4646
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_custom_attribute_defs.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
DOCUMENTATION = '''
1919
---
2020
module: vmware_guest_custom_attribute_defs
21-
short_description: Manage custom attributes definitions for virtual machine from VMWare
21+
short_description: Manage custom attributes definitions for virtual machine from VMware
2222
description:
23-
- This module can be used to add and remove custom attributes definitions for the given virtual machine from VMWare.
23+
- This module can be used to add and remove custom attributes definitions for the given virtual machine from VMware.
2424
version_added: 2.7
2525
author:
2626
- Jimmy Conner (@cigamit)
@@ -50,7 +50,7 @@
5050
'''
5151

5252
EXAMPLES = '''
53-
- name: Add VMWare Attribute Definition
53+
- name: Add VMware Attribute Definition
5454
vmware_guest_custom_attribute_defs:
5555
hostname: "{{ vcenter_hostname }}"
5656
username: "{{ vcenter_username }}"
@@ -60,7 +60,7 @@
6060
delegate_to: localhost
6161
register: defs
6262
63-
- name: Remove VMWare Attribute Definition
63+
- name: Remove VMware Attribute Definition
6464
vmware_guest_custom_attribute_defs:
6565
hostname: "{{ vcenter_hostname }}"
6666
username: "{{ vcenter_username }}"

lib/ansible/modules/cloud/vmware/vmware_guest_custom_attributes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
DOCUMENTATION = '''
2121
---
2222
module: vmware_guest_custom_attributes
23-
short_description: Manage custom attributes from VMWare for the given virtual machine
23+
short_description: Manage custom attributes from VMware for the given virtual machine
2424
description:
2525
- This module can be used to add, remove and update custom attributes for the given virtual machine.
2626
version_added: 2.7
@@ -50,7 +50,7 @@
5050
- This is required parameter, if C(name) is not supplied.
5151
use_instance_uuid:
5252
description:
53-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
53+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
5454
default: no
5555
type: bool
5656
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_disk.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
required: True
6363
use_instance_uuid:
6464
description:
65-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
65+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
6666
default: no
6767
type: bool
6868
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_disk_facts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
- This is required parameter, if parameter C(name) is not supplied.
4444
use_instance_uuid:
4545
description:
46-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
46+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4747
default: no
4848
type: bool
4949
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_facts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
- This is required if name is not supplied.
4747
use_instance_uuid:
4848
description:
49-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
49+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
5050
default: no
5151
type: bool
5252
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_find.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
- This is required if C(name) parameter is not supplied.
3939
use_instance_uuid:
4040
description:
41-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
41+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4242
default: no
4343
type: bool
4444
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_move.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
- This is required if C(name) is not supplied.
4040
use_instance_uuid:
4141
description:
42-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
42+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4343
default: no
4444
type: bool
4545
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_powerstate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
- This is required if name is not supplied.
4545
use_instance_uuid:
4646
description:
47-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
47+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4848
default: no
4949
type: bool
5050
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
- This is required if C(name) parameter is not supplied.
5757
use_instance_uuid:
5858
description:
59-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
59+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
6060
default: no
6161
type: bool
6262
version_added: '2.8'
@@ -92,7 +92,7 @@
9292
quiesce:
9393
description:
9494
- If set to C(true) and virtual machine is powered on, it will quiesce the file system in virtual machine.
95-
- Note that VMWare Tools are required for this flag.
95+
- Note that VMware Tools are required for this flag.
9696
- If virtual machine is powered off or VMware Tools are not available, then this flag is set to C(false).
9797
- If virtual machine does not provide capability to take quiesce snapshot, then this flag is set to C(false).
9898
required: False

lib/ansible/modules/cloud/vmware/vmware_guest_snapshot_facts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
- The C(folder) is ignored, if C(uuid) is provided.
4141
use_instance_uuid:
4242
description:
43-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
43+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
4444
default: no
4545
type: bool
4646
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_guest_tools_upgrade.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
short_description: Module to upgrade VMTools
2121
version_added: 2.8
2222
description:
23-
- This module upgrades the VMWare Tools on Windows and Linux guests.
23+
- This module upgrades the VMware Tools on Windows and Linux guests.
2424
requirements:
2525
- "python >= 2.6"
2626
- PyVmomi
@@ -66,7 +66,7 @@
6666
'''
6767

6868
EXAMPLES = '''
69-
- name: Upgrade VMWare Tools
69+
- name: Upgrade VMware Tools
7070
vmware_guest_tools_upgrade:
7171
hostname: "{{ vcenter_hostname }}"
7272
username: "{{ vcenter_username }}"
@@ -134,7 +134,7 @@ def upgrade_tools(self, vm):
134134
else:
135135
result.update(
136136
failed=True,
137-
msg="VMWare tools could not be upgraded",
137+
msg="VMware tools could not be upgraded",
138138
)
139139
return result
140140

lib/ansible/modules/cloud/vmware/vmware_guest_tools_wait.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
- This is required, if C(name) is not supplied.
5959
use_instance_uuid:
6060
description:
61-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
61+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
6262
default: no
6363
type: bool
6464
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_vm_shell.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def __init__(self, module):
238238

239239
tools_status = vm.guest.toolsStatus
240240
if tools_status in ['toolsNotInstalled', 'toolsNotRunning']:
241-
self.module.fail_json(msg="VMWareTools is not installed or is not running in the guest."
241+
self.module.fail_json(msg="VMwareTools is not installed or is not running in the guest."
242242
" VMware Tools are necessary to run this module.")
243243

244244
try:

lib/ansible/modules/cloud/vmware/vmware_vmotion.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
version_added: 2.7
5050
use_instance_uuid:
5151
description:
52-
- Whether to use the VMWare instance UUID rather than the BIOS UUID.
52+
- Whether to use the VMware instance UUID rather than the BIOS UUID.
5353
default: no
5454
type: bool
5555
version_added: '2.8'

lib/ansible/modules/cloud/vmware/vmware_vswitch.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
mtu: 9000
7878
delegate_to: localhost
7979
80-
- name: Add a VMWare vSwitch without any physical NIC attached
80+
- name: Add a VMware vSwitch without any physical NIC attached
8181
vmware_vswitch:
8282
hostname: '{{ esxi_hostname }}'
8383
username: '{{ esxi_username }}'
@@ -86,7 +86,7 @@
8686
mtu: 9000
8787
delegate_to: localhost
8888
89-
- name: Add a VMWare vSwitch with multiple NICs
89+
- name: Add a VMware vSwitch with multiple NICs
9090
vmware_vswitch:
9191
hostname: '{{ esxi_hostname }}'
9292
username: '{{ esxi_username }}'

lib/ansible/modules/cloud/vmware/vsphere_copy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
module: vsphere_copy
2020
short_description: Copy a file to a VMware datastore
2121
description:
22-
- Upload files to a VMware datastore through a VCenter REST API.
22+
- Upload files to a VMware datastore through a vCenter REST API.
2323
version_added: 2.0
2424
author:
2525
- Dag Wieers (@dagwieers)

lib/ansible/modules/network/avi/avi_cloud.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
'''
201201

202202
EXAMPLES = """
203-
- name: Create a VMWare cloud with write access mode
203+
- name: Create a VMware cloud with write access mode
204204
avi_cloud:
205205
username: '{{ username }}'
206206
controller: '{{ controller }}'
@@ -210,7 +210,7 @@
210210
enable_vip_static_routes: false
211211
license_type: LIC_CORES
212212
mtu: 1500
213-
name: VCenter Cloud
213+
name: vCenter Cloud
214214
prefer_static_routes: false
215215
tenant_ref: admin
216216
vcenter_configuration:

test/integration/targets/tower_credential/tasks/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@
265265
that:
266266
- "result is changed"
267267

268-
- name: Create a valid VMWare credential
268+
- name: Create a valid VMware credential
269269
tower_credential:
270-
name: VMWare Credential
270+
name: VMware Credential
271271
organization: Default
272272
state: present
273273
kind: vmware
@@ -280,9 +280,9 @@
280280
that:
281281
- "result is changed"
282282

283-
- name: Delete an VMWare credential
283+
- name: Delete an VMware credential
284284
tower_credential:
285-
name: VMWare Credential
285+
name: VMware Credential
286286
organization: Default
287287
state: absent
288288
kind: vmware

0 commit comments

Comments
 (0)