diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_groups.py b/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_groups.py deleted file mode 120000 index b64d5d560a..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_groups.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_affinity_group.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_labels.py b/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_labels.py deleted file mode 120000 index 90f47777c8..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_labels.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_affinity_label.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_labels_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_labels_facts.py deleted file mode 120000 index 744a958e5a..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_affinity_labels_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_affinity_label_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py b/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py deleted file mode 120000 index ae8c7c2d8a..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_cluster.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_clusters_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_clusters_facts.py deleted file mode 120000 index 3ca1876e0d..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_clusters_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_cluster_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_datacenters.py b/lib/ansible/modules/cloud/ovirt/_ovirt_datacenters.py deleted file mode 120000 index a4f337743c..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_datacenters.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_datacenter.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_datacenters_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_datacenters_facts.py deleted file mode 120000 index 38cbd6b408..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_datacenters_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_datacenter_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py b/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py deleted file mode 120000 index 757bf86e54..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_disk.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_external_providers.py b/lib/ansible/modules/cloud/ovirt/_ovirt_external_providers.py deleted file mode 120000 index baa266bb34..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_external_providers.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_external_provider.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_external_providers_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_external_providers_facts.py deleted file mode 120000 index d0fe5503f6..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_external_providers_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_external_provider_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_groups.py b/lib/ansible/modules/cloud/ovirt/_ovirt_groups.py deleted file mode 120000 index 7e5cc02b88..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_groups.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_group.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_groups_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_groups_facts.py deleted file mode 120000 index e10cb60be2..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_groups_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_group_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_host_networks.py b/lib/ansible/modules/cloud/ovirt/_ovirt_host_networks.py deleted file mode 120000 index 03356e5267..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_host_networks.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_host_network.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_hosts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_hosts.py deleted file mode 120000 index 388dd78536..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_hosts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_host.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_hosts_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_hosts_facts.py deleted file mode 120000 index 243e94c2f0..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_hosts_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_host_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_mac_pools.py b/lib/ansible/modules/cloud/ovirt/_ovirt_mac_pools.py deleted file mode 120000 index e518729a5e..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_mac_pools.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_mac_pool.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_networks.py b/lib/ansible/modules/cloud/ovirt/_ovirt_networks.py deleted file mode 120000 index 93006fd6ed..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_networks.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_network.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_networks_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_networks_facts.py deleted file mode 120000 index 11c253f8ca..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_networks_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_network_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_nics.py b/lib/ansible/modules/cloud/ovirt/_ovirt_nics.py deleted file mode 120000 index f5f35c34e0..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_nics.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_nic.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_nics_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_nics_facts.py deleted file mode 120000 index b3c27b4b9e..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_nics_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_nic_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_permissions.py b/lib/ansible/modules/cloud/ovirt/_ovirt_permissions.py deleted file mode 120000 index 013e35713f..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_permissions.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_permission.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_permissions_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_permissions_facts.py deleted file mode 120000 index 32b00ac5f2..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_permissions_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_permission_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_quotas.py b/lib/ansible/modules/cloud/ovirt/_ovirt_quotas.py deleted file mode 120000 index de2c22ab09..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_quotas.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_quota.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_quotas_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_quotas_facts.py deleted file mode 120000 index 099905ea3b..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_quotas_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_quota_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_scheduling_policies_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_scheduling_policies_facts.py deleted file mode 120000 index caf461d5a3..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_scheduling_policies_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_scheduling_policy_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_snapshots.py b/lib/ansible/modules/cloud/ovirt/_ovirt_snapshots.py deleted file mode 120000 index fd53874c17..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_snapshots.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_snapshot.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_snapshots_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_snapshots_facts.py deleted file mode 120000 index 0116e96b1a..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_snapshots_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_snapshot_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_connections.py b/lib/ansible/modules/cloud/ovirt/_ovirt_storage_connections.py deleted file mode 120000 index c42994b3ee..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_connections.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_storage_connection.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_domains.py b/lib/ansible/modules/cloud/ovirt/_ovirt_storage_domains.py deleted file mode 120000 index 0d5bd80ea3..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_domains.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_storage_domain.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_domains_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_storage_domains_facts.py deleted file mode 120000 index e3102b1939..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_domains_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_storage_domain_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_templates_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_storage_templates_facts.py deleted file mode 120000 index aca2a6f8a5..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_templates_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_storage_template_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_vms_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_storage_vms_facts.py deleted file mode 120000 index 44c6e72b38..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_storage_vms_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_storage_vm_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_tags.py b/lib/ansible/modules/cloud/ovirt/_ovirt_tags.py deleted file mode 120000 index 361e12fd5b..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_tags.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_tag.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_tags_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_tags_facts.py deleted file mode 120000 index 29de4f63d1..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_tags_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_tag_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_templates.py b/lib/ansible/modules/cloud/ovirt/_ovirt_templates.py deleted file mode 120000 index a987e7f47c..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_templates.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_template.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_templates_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_templates_facts.py deleted file mode 120000 index 2045d76ab8..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_templates_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_template_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_users.py b/lib/ansible/modules/cloud/ovirt/_ovirt_users.py deleted file mode 120000 index f32d164ef4..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_users.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_user.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_users_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_users_facts.py deleted file mode 120000 index 2675ae6432..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_users_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_user_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_vmpools.py b/lib/ansible/modules/cloud/ovirt/_ovirt_vmpools.py deleted file mode 120000 index 0afacc5b96..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_vmpools.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_vmpool.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_vmpools_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_vmpools_facts.py deleted file mode 120000 index 78d066bb91..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_vmpools_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_vmpool_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_vms.py b/lib/ansible/modules/cloud/ovirt/_ovirt_vms.py deleted file mode 120000 index d2d70257f4..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_vms.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_vm.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/_ovirt_vms_facts.py b/lib/ansible/modules/cloud/ovirt/_ovirt_vms_facts.py deleted file mode 120000 index e1a5f4b639..0000000000 --- a/lib/ansible/modules/cloud/ovirt/_ovirt_vms_facts.py +++ /dev/null @@ -1 +0,0 @@ -ovirt_vm_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_affinity_group.py b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_group.py index 53f4a27507..88194a60bb 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_affinity_group.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_group.py @@ -265,9 +265,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_affinity_groups': - module.deprecate("The 'ovirt_affinity_groups' module is being renamed 'ovirt_affinity_group'", version=2.8) - check_sdk(module) try: auth = module.params.pop('auth') diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label.py b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label.py index 658c466496..6eae6f1db0 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label.py @@ -181,9 +181,6 @@ def main(): ], ) - if module._name == 'ovirt_affinity_labels': - module.deprecate("The 'ovirt_affinity_labels' module is being renamed 'ovirt_affinity_label'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label_facts.py index ed45d239fe..458cb9c57e 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_label_facts.py @@ -110,9 +110,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_affinity_labels_facts': - module.deprecate("The 'ovirt_affinity_labels_facts' module is being renamed 'ovirt_affinity_label_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py b/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py index 1570c3d7d0..d5084840b1 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py @@ -657,9 +657,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_clusters': - module.deprecate("The 'ovirt_clusters' module is being renamed 'ovirt_cluster'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_cluster_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_cluster_facts.py index ab6ada7f1e..c7f5d8cdba 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_cluster_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_cluster_facts.py @@ -81,9 +81,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_clusters_facts': - module.deprecate("The 'ovirt_clusters_facts' module is being renamed 'ovirt_cluster_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_datacenter.py b/lib/ansible/modules/cloud/ovirt/ovirt_datacenter.py index 088d480a62..b556dd64ae 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_datacenter.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_datacenter.py @@ -201,9 +201,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_datacenters': - module.deprecate("The 'ovirt_datacenters' module is being renamed 'ovirt_datacenter'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_datacenter_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_datacenter_facts.py index b9740de46c..acbcbd3b7b 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_datacenter_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_datacenter_facts.py @@ -64,9 +64,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_datacenters_facts': - module.deprecate("The 'ovirt_datacenters_facts' module is being renamed 'ovirt_datacenter_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py index 18476fb619..0738f0110c 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py @@ -584,9 +584,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_disks': - module.deprecate("The 'ovirt_disks' module is being renamed 'ovirt_disk'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_external_provider.py b/lib/ansible/modules/cloud/ovirt/ovirt_external_provider.py index 3a6e5f6f85..0c7bc23f16 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_external_provider.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_external_provider.py @@ -360,9 +360,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_external_providers': - module.deprecate("The 'ovirt_external_providers' module is being renamed 'ovirt_external_provider'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_external_provider_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_external_provider_facts.py index d001bba690..5ceb5be5eb 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_external_provider_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_external_provider_facts.py @@ -119,9 +119,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_external_providers_facts': - module.deprecate("The 'ovirt_external_providers_facts' module is being renamed 'ovirt_external_provider_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_group.py b/lib/ansible/modules/cloud/ovirt/ovirt_group.py index 1afdbf2704..4f6777ed25 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_group.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_group.py @@ -155,9 +155,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_groups': - module.deprecate("The 'ovirt_groups' module is being renamed 'ovirt_group'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_group_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_group_facts.py index aa9a267ace..2320a9484e 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_group_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_group_facts.py @@ -79,9 +79,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_groups_facts': - module.deprecate("The 'ovirt_groups_facts' module is being renamed 'ovirt_group_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_host.py b/lib/ansible/modules/cloud/ovirt/ovirt_host.py index b63bcbd28e..4d17f9c191 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_host.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_host.py @@ -440,9 +440,6 @@ def main(): ] ) - if module._name == 'ovirt_hosts': - module.deprecate("The 'ovirt_hosts' module is being renamed 'ovirt_host'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_host_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_host_facts.py index 5e6b677664..e8a5d68367 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_host_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_host_facts.py @@ -74,9 +74,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_hosts_facts': - module.deprecate("The 'ovirt_hosts_facts' module is being renamed 'ovirt_host_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_host_network.py b/lib/ansible/modules/cloud/ovirt/ovirt_host_network.py index 243b6134d4..06a5a7412c 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_host_network.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_host_network.py @@ -334,9 +334,6 @@ def main(): ) module = AnsibleModule(argument_spec=argument_spec) - if module._name == 'ovirt_host_networks': - module.deprecate("The 'ovirt_host_networks' module is being renamed 'ovirt_host_network'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_mac_pool.py b/lib/ansible/modules/cloud/ovirt/ovirt_mac_pool.py index 5e83d84a5b..7d9d2dbc09 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_mac_pool.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_mac_pool.py @@ -152,9 +152,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_mac_pools': - module.deprecate("The 'ovirt_mac_pools' module is being renamed 'ovirt_mac_pool'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_network.py b/lib/ansible/modules/cloud/ovirt/ovirt_network.py index 2df6b86655..14f21bae87 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_network.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_network.py @@ -253,9 +253,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_networks': - module.deprecate("The 'ovirt_networks' module is being renamed 'ovirt_network'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_network_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_network_facts.py index 4aa879f620..964bc91e3b 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_network_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_network_facts.py @@ -81,9 +81,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_networks_facts': - module.deprecate("The 'ovirt_networks_facts' module is being renamed 'ovirt_network_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_nic.py b/lib/ansible/modules/cloud/ovirt/ovirt_nic.py index 95e7832b1f..61e0b6d9cb 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_nic.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_nic.py @@ -201,9 +201,6 @@ def main(): required_one_of=[['vm', 'template']], ) - if module._name == 'ovirt_nics': - module.deprecate("The 'ovirt_nics' module is being renamed 'ovirt_nic'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_nic_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_nic_facts.py index 5cf96c953c..a3bb6f0f69 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_nic_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_nic_facts.py @@ -86,9 +86,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_nics_facts': - module.deprecate("The 'ovirt_nics_facts' module is being renamed 'ovirt_nic_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_permission.py b/lib/ansible/modules/cloud/ovirt/ovirt_permission.py index cda29fda54..4465735a0a 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_permission.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_permission.py @@ -274,9 +274,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_permissions': - module.deprecate("The 'ovirt_permissions' module is being renamed 'ovirt_permission'", version=2.8) - check_sdk(module) if (module.params['object_name'] is None and module.params['object_id'] is None) and module.params['object_type'] != 'system': diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_permission_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_permission_facts.py index a5389bd5bb..c8c7709406 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_permission_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_permission_facts.py @@ -123,9 +123,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_permissions_facts': - module.deprecate("The 'ovirt_permissions_facts' module is being renamed 'ovirt_permission_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_quota.py b/lib/ansible/modules/cloud/ovirt/ovirt_quota.py index a2282ddb23..4e1ff9f798 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_quota.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_quota.py @@ -244,9 +244,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_quotas': - module.deprecate("The 'ovirt_quotas' module is being renamed 'ovirt_quota'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_quota_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_quota_facts.py index 42c4e51402..04a6cc53f1 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_quota_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_quota_facts.py @@ -86,9 +86,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_quotas_facts': - module.deprecate("The 'ovirt_quotas_facts' module is being renamed 'ovirt_quota_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py index b2cc4bc63c..d1f1a769a4 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py @@ -86,9 +86,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_scheduling_policie_facts': - module.deprecate("The 'ovirt_scheduling_policie_facts' module is being renamed 'ovirt_scheduling_policy_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_snapshot.py b/lib/ansible/modules/cloud/ovirt/ovirt_snapshot.py index e988c3e820..812e9f7265 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_snapshot.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_snapshot.py @@ -246,9 +246,6 @@ def main(): ] ) - if module._name == 'ovirt_snapshots': - module.deprecate("The 'ovirt_snapshots' module is being renamed 'ovirt_snapshot'", version=2.8) - check_sdk(module) vm_name = module.params.get('vm_name') diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_snapshot_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_snapshot_facts.py index 8d88f95706..d9a9ff8683 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_snapshot_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_snapshot_facts.py @@ -77,9 +77,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_snapshots_facts': - module.deprecate("The 'ovirt_snapshots_facts' module is being renamed 'ovirt_snapshot_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_connection.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_connection.py index d3d330e661..ab60d7e36a 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_connection.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_connection.py @@ -232,9 +232,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_storage_connections': - module.deprecate("The 'ovirt_storage_connections' module is being renamed 'ovirt_storage_connection'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain.py index 7f9fc57d31..55115f8534 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain.py @@ -626,9 +626,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_storage_domains': - module.deprecate("The 'ovirt_storage_domains' module is being renamed 'ovirt_storage_domain'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain_facts.py index 1b90a72863..bc8420b96d 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domain_facts.py @@ -81,9 +81,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_storage_domains_facts': - module.deprecate("The 'ovirt_storage_domains_facts' module is being renamed 'ovirt_storage_domain_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_template_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_template_facts.py index d1e142b47b..c2ecf6196e 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_template_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_template_facts.py @@ -91,9 +91,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_storage_templates_facts': - module.deprecate("The 'ovirt_storage_templates_facts' module is being renamed 'ovirt_storage_template_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_vm_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_vm_facts.py index 96f41c203e..9b691101b0 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_vm_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_vm_facts.py @@ -91,9 +91,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_storage_vms_facts': - module.deprecate("The 'ovirt_storage_vms_facts' module is being renamed 'ovirt_storage_vm_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_tag.py b/lib/ansible/modules/cloud/ovirt/ovirt_tag.py index 7fe4697d7c..79a4e2f644 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_tag.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_tag.py @@ -228,9 +228,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_tags': - module.deprecate("The 'ovirt_tags' module is being renamed 'ovirt_tag'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_tag_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_tag_facts.py index c08c76b59d..1201f4cb44 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_tag_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_tag_facts.py @@ -100,9 +100,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_tags_facts': - module.deprecate("The 'ovirt_tags_facts' module is being renamed 'ovirt_tag_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_template.py b/lib/ansible/modules/cloud/ovirt/ovirt_template.py index a041c21c9c..6c102c3e04 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_template.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_template.py @@ -474,9 +474,6 @@ def main(): required_one_of=[['id', 'name']], ) - if module._name == 'ovirt_templates': - module.deprecate("The 'ovirt_templates' module is being renamed 'ovirt_template'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_template_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_template_facts.py index 73af9533d1..b4a618db9f 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_template_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_template_facts.py @@ -81,9 +81,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_templates_facts': - module.deprecate("The 'ovirt_templates_facts' module is being renamed 'ovirt_template_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_user.py b/lib/ansible/modules/cloud/ovirt/ovirt_user.py index 55fc0c894e..dc37ff4d91 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_user.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_user.py @@ -138,9 +138,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_users': - module.deprecate("The 'ovirt_users' module is being renamed 'ovirt_user'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_user_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_user_facts.py index 655bdd953c..0031f734a3 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_user_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_user_facts.py @@ -79,9 +79,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_users_facts': - module.deprecate("The 'ovirt_users_facts' module is being renamed 'ovirt_user_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py index 7dae8e72ff..a9f0fb7de7 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py @@ -1986,9 +1986,6 @@ def main(): required_one_of=[['id', 'name']], ) - if module._name == 'ovirt_vms': - module.deprecate("The 'ovirt_vms' module is being renamed 'ovirt_vm'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vm_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_vm_facts.py index be20186729..788c464282 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vm_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vm_facts.py @@ -97,9 +97,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_vms_facts': - module.deprecate("The 'ovirt_vms_facts' module is being renamed 'ovirt_vm_facts'", version=2.8) - check_sdk(module) try: diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vmpool.py b/lib/ansible/modules/cloud/ovirt/ovirt_vmpool.py index 8696a36001..a2f2adfdc1 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vmpool.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vmpool.py @@ -197,9 +197,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ovirt_vmpools': - module.deprecate("The 'ovirt_vmpools' module is being renamed 'ovirt_vmpool'", version=2.8) - check_sdk(module) check_params(module) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vmpool_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_vmpool_facts.py index d3736744c9..3e97fb1ec5 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vmpool_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vmpool_facts.py @@ -79,9 +79,6 @@ def main(): ) module = AnsibleModule(argument_spec) - if module._name == 'ovirt_vmpools_facts': - module.deprecate("The 'ovirt_vmpools_facts' module is being renamed 'ovirt_vmpool_facts'", version=2.8) - check_sdk(module) try: