Skip to content

Commit 078cedd

Browse files
authored
Merge pull request #2283 from mariolenz/20250115-deprecate-inventory-plugins
Deprecate inventory plugins
2 parents dfbdb73 + 374427c commit 078cedd

31 files changed

+24
-1029
lines changed

.github/workflows/extra-docs-linting.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install dependent collections
3535
run: >
3636
ansible-galaxy collection install
37-
'vmware.vmware>=1.7.1'
37+
'vmware.vmware>=1.9.0'
3838
3939
- name: Run collection docs linter
4040
run: antsibull-docs lint-collection-docs . --plugin-docs --skip-rstcheck
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
deprecated_features:
2+
- vmware_host_inventory - the inventory plugin is deprecated and will be removed in community.vmware 7.0.0
3+
(https://github.com/ansible-collections/community.vmware/pull/2283).
4+
- vmware_vm_inventory - the inventory plugin is deprecated and will be removed in community.vmware 7.0.0
5+
(https://github.com/ansible-collections/community.vmware/pull/2283).

meta/runtime.yml

+9
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,15 @@ action_groups:
180180
- vsphere_file
181181

182182
plugin_routing:
183+
inventory:
184+
vmware_host_inventory:
185+
deprecation:
186+
removal_version: 7.0.0
187+
warning_text: Use vmware.vmware.esxi_hosts instead.
188+
vmware_vm_inventory:
189+
deprecation:
190+
removal_version: 7.0.0
191+
warning_text: Use vmware.vmware.vms instead.
183192
modules:
184193
vmware_cluster:
185194
deprecation:

plugins/connection/vmware_tools.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@
8686
required: false
8787
vm_uuid:
8888
description:
89+
- UUID of the virtual machine
8990
- Mutually exclusive with O(vm_path)
90-
- VM UUID to the connection.
91-
- UUID of the virtual machine from property config.uuid of P(community.vmware.vmware_vm_inventory#inventory) plugin
9291
vars:
9392
- name: ansible_vmware_guest_uuid
9493
required: false

plugins/inventory/vmware_host_inventory.py

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
DOCUMENTATION = r"""
1212
name: vmware_host_inventory
13+
deprecated:
14+
removed_in: 7.0.0
15+
why: This module has been moved to the L(new vmware.vmware collection,https://forum.ansible.com/t/5880)
16+
alternative: Use P(vmware.vmware.esxi_hosts#inventory) instead.
1317
short_description: VMware ESXi hostsystem inventory source
1418
author:
1519
- Abhijeet Kasurde (@Akasurde)

plugins/inventory/vmware_vm_inventory.py

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
DOCUMENTATION = r'''
1111
name: vmware_vm_inventory
12+
deprecated:
13+
removed_in: 7.0.0
14+
why: This module has been moved to the L(new vmware.vmware collection,https://forum.ansible.com/t/5880)
15+
alternative: Use P(vmware.vmware.vms#inventory) instead.
1216
short_description: VMware Guest inventory source
1317
author:
1418
- Abhijeet Kasurde (@Akasurde)

tests/integration/targets/inventory_vmware_host_inventory/aliases

-3
This file was deleted.

tests/integration/targets/inventory_vmware_host_inventory/playbook/build_inventory.yml

-23
This file was deleted.

tests/integration/targets/inventory_vmware_host_inventory/playbook/build_inventory_with_cache.yml

-14
This file was deleted.

tests/integration/targets/inventory_vmware_host_inventory/playbook/build_inventory_without_cache.yml

-14
This file was deleted.

tests/integration/targets/inventory_vmware_host_inventory/playbook/install_dependencies.yml

-7
This file was deleted.

tests/integration/targets/inventory_vmware_host_inventory/playbook/prepare_vmware.yml

-17
This file was deleted.

tests/integration/targets/inventory_vmware_host_inventory/playbook/test_inventory_cache.yml

-51
This file was deleted.

0 commit comments

Comments
 (0)