diff --git a/changelogs/fragments/ovirt-fixup.yml b/changelogs/fragments/ovirt-fixup.yml new file mode 100644 index 0000000000..073a4cfbe8 --- /dev/null +++ b/changelogs/fragments/ovirt-fixup.yml @@ -0,0 +1,2 @@ +bugfixes: +- "ovirt* modules - remove bad unnecessary import for current ansible-core development version (https://github.com/ansible-collections/community.general/pull/2381)." diff --git a/plugins/modules/cloud/misc/ovirt.py b/plugins/modules/cloud/misc/ovirt.py index 25e3081c8f..eea26daf28 100644 --- a/plugins/modules/cloud/misc/ovirt.py +++ b/plugins/modules/cloud/misc/ovirt.py @@ -243,7 +243,6 @@ except ImportError: HAS_OVIRTSDK = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.common.removed import removed_module # ------------------------------------------------------------------- # diff --git a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py index e560e13e30..da791d71ca 100644 --- a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py @@ -111,7 +111,6 @@ ovirt_affinity_labels: import fnmatch import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_api_facts.py b/plugins/modules/cloud/ovirt/ovirt_api_facts.py index 4085a7022b..5d2bcd5d69 100644 --- a/plugins/modules/cloud/ovirt/ovirt_api_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_api_facts.py @@ -52,7 +52,6 @@ ovirt_api: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py index e4916a2684..ebbb8f4d7c 100644 --- a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py @@ -73,7 +73,6 @@ ovirt_clusters: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py index 0de7272939..7532055145 100644 --- a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py @@ -56,7 +56,6 @@ ovirt_datacenters: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py index 6e0c9f699d..c634c629d3 100644 --- a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py @@ -72,7 +72,6 @@ ovirt_disks: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_event_facts.py b/plugins/modules/cloud/ovirt/ovirt_event_facts.py index 50a2065498..06278566d5 100644 --- a/plugins/modules/cloud/ovirt/ovirt_event_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_event_facts.py @@ -103,7 +103,6 @@ ovirt_events: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py index f9ac8b9777..981e5fbd8b 100644 --- a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py @@ -87,7 +87,6 @@ ovirt_external_providers: import fnmatch import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_group_facts.py b/plugins/modules/cloud/ovirt/ovirt_group_facts.py index 40b037f4ee..40b636af2b 100644 --- a/plugins/modules/cloud/ovirt/ovirt_group_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_group_facts.py @@ -71,7 +71,6 @@ ovirt_groups: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_host_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_facts.py index ea585e9051..2d3c746040 100644 --- a/plugins/modules/cloud/ovirt/ovirt_host_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_host_facts.py @@ -78,7 +78,6 @@ ovirt_hosts: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py index 62af3e4ba1..8c866fe0de 100644 --- a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py @@ -92,7 +92,6 @@ try: except ImportError: pass -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_network_facts.py b/plugins/modules/cloud/ovirt/ovirt_network_facts.py index 781dd85805..30e55fcbd5 100644 --- a/plugins/modules/cloud/ovirt/ovirt_network_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_network_facts.py @@ -73,7 +73,6 @@ ovirt_networks: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py index 2cc1194fbc..e2643aae5c 100644 --- a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py @@ -76,7 +76,6 @@ ovirt_nics: import fnmatch import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py index 52ba3624f1..48da0c9286 100644 --- a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py @@ -88,7 +88,6 @@ try: except ImportError: pass -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py index b2424305ae..e9b3fc6287 100644 --- a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py @@ -76,7 +76,6 @@ ovirt_quotas: import fnmatch import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py index 737468835e..573cb35769 100644 --- a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py @@ -65,7 +65,6 @@ ovirt_snapshots: import fnmatch import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py index b9d814c121..4f16ae4d1e 100644 --- a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py @@ -74,7 +74,6 @@ ovirt_storage_domains: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py index 1c58327801..5a92fadd78 100644 --- a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py @@ -79,7 +79,6 @@ ovirt_storage_templates: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py index d024794849..caed0faee0 100644 --- a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py @@ -79,7 +79,6 @@ ovirt_storage_vms: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py index a6ce97dd42..d23387ab96 100644 --- a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py @@ -95,7 +95,6 @@ ovirt_tags: import fnmatch import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_template_facts.py index 7595c64afa..279b849d9d 100644 --- a/plugins/modules/cloud/ovirt/ovirt_template_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_template_facts.py @@ -72,7 +72,6 @@ ovirt_templates: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_user_facts.py b/plugins/modules/cloud/ovirt/ovirt_user_facts.py index ce7ab8d661..4213e03bcc 100644 --- a/plugins/modules/cloud/ovirt/ovirt_user_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_user_facts.py @@ -71,7 +71,6 @@ ovirt_users: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py index a5182755e0..711c8f6f01 100644 --- a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py @@ -102,7 +102,6 @@ ovirt_vms: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk, diff --git a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py index 24842be56c..29944ca96f 100644 --- a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py +++ b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py @@ -71,7 +71,6 @@ ovirt_vm_pools: import traceback -from ansible.module_utils.common.removed import removed_module from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.general.plugins.module_utils._ovirt import ( check_sdk,