Convert all OS module imports to collections imports

Instead of importing code from 2.9 Ansible modules, start import it from Openstack Ansible collection. It requires Openstack Ansible collection to be installed and will work with both Ansible 2.9 and 2.11 Change-Id: I0f9f0d26a6b499c13af994edd1353b19620be14d
2021-08-04 23:04:03 +03:00 · 2021-08-04 23:04:03 +03:00 · a4afb20deb
commit a4afb20deb
parent 4e481d662a
43 changed files with 117 additions and 218 deletions
--- a/_skeleton_role_/defaults/main.yml.j2
+++ b/_skeleton_role_/defaults/main.yml.j2
@ -19,4 +19,5 @@

 # All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo_', '') }}"
 tripleo_{{ role_name | replace('tripleo_', '') }}_debug: {% raw %}"{{ (ansible_verbosity | int) >= 2 | bool }}"{% endraw %}
+
 tripleo_{{ role_name | replace('tripleo_', '') }}_hide_sensitive_logs: true
--- a/ansible-requirements.txt
+++ b/ansible-requirements.txt
@ -1,4 +1,4 @@
-ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0
+ansible-core<2.12.0
 metalsmith>=1.4.0 # Apache-2.0
 importlib-metadata
 jsonschema  # MIT
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@ -8,15 +8,15 @@ pytest-cov
 pytest-html
 pytest-xdist
 mock
-molecule>=3.3.4,<3.4
-molecule-podman>=0.3.0
+molecule>=3.3.4
+molecule-podman>=1.0.0a1
 ruamel.yaml
 testinfra
 netaddr
 jinja2

 # this is required for the docs build jobs
-ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0
+ansible-core<2.12.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 openstackdocstheme>=2.2.1 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@ -28,11 +28,14 @@ sitepackages = True
 deps =
   -r {toxinidir}/test-requirements.txt
   -r {toxinidir}/ansible-requirements.txt
-commands = stestr run {posargs}
+commands =
+    ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-collections-requirements.yml
+    stestr run {posargs}
 allowlist_externals =
  bash
  tox
  true
+  ansible-galaxy

 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
@ -56,6 +59,7 @@ commands =
    pip check
    bash -c "ANSIBLE_ROLES_PATH='{toxinidir}/tripleo_ansible/roles.galaxy' \
           ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-role-requirements.yml"
+    ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-collections-requirements.yml
    python -m pre_commit run -a

 [testenv:releasenotes]
@ -72,6 +76,7 @@ deps =
  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
  -r {toxinidir}/doc/requirements.txt
 commands=
+    ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-collections-requirements.yml
    doc8 doc
    sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T

@ -97,6 +102,7 @@ deps =
    {[testenv:linters]deps}
    -r {toxinidir}/molecule-requirements.txt
 commands =
+    ansible-galaxy install -fr {toxinidir}/tripleo_ansible/ansible-collections-requirements.yml
    bash -c "ansible-playbook -i localhost, role-addition.yml -e role_name=skeleton_test"
    bash -c "if podman ps 2> /dev/null; then  \
                cd {toxinidir}/tripleo_ansible/roles/skeleton_test;  \
--- a/tripleo_ansible/ansible-collections-requirements.yml
+++ b/tripleo_ansible/ansible-collections-requirements.yml
@ -0,0 +1,7 @@
+
+collections:
+  - name: https://opendev.org/openstack/ansible-collections-openstack.git
+    type: git
+  - containers.podman
+  - community.general
+  - ansible.posix
--- a/tripleo_ansible/ansible_plugins/modules/baremetal_register_or_update_nodes.py
+++ b/tripleo_ansible/ansible_plugins/modules/baremetal_register_or_update_nodes.py
@ -19,9 +19,9 @@ import yaml

 from ansible.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from tripleo_common.utils import nodes

--- a/tripleo_ansible/ansible_plugins/modules/os_baremetal_clean_node.py
+++ b/tripleo_ansible/ansible_plugins/modules/os_baremetal_clean_node.py
@ -389,7 +389,7 @@ from concurrent import futures
 from openstack import exceptions

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import (openstack_full_argument_spec,
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
                                            openstack_module_kwargs,
                                            openstack_cloud_from_module)

--- a/tripleo_ansible/ansible_plugins/modules/os_baremetal_node_info.py
+++ b/tripleo_ansible/ansible_plugins/modules/os_baremetal_node_info.py
@ -341,9 +341,9 @@ EXAMPLES = '''
 import yaml

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 def _choose_id_value(module):
--- a/tripleo_ansible/ansible_plugins/modules/os_baremetal_provide_node.py
+++ b/tripleo_ansible/ansible_plugins/modules/os_baremetal_provide_node.py
@ -334,9 +334,9 @@ from openstack.exceptions import ResourceFailure, ResourceTimeout
 from openstack.utils import iterate_timeout

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 def get_info_nodes(nodes_wait, msg, result, client):
--- a/tripleo_ansible/ansible_plugins/modules/os_tripleo_baremetal_node_introspection.py
+++ b/tripleo_ansible/ansible_plugins/modules/os_tripleo_baremetal_node_introspection.py
@ -122,9 +122,9 @@ import time
 import yaml

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 class IntrospectionManagement(object):
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_baremetal_check_existing.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_baremetal_check_existing.py
@ -17,9 +17,9 @@ __metaclass__ = type

 from ansible.module_utils import baremetal_deploy as bd
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_cloud_from_module
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs

 import keystoneauth1
 import metalsmith
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_baremetal_populate_environment.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_baremetal_populate_environment.py
@ -17,9 +17,9 @@ __metaclass__ = type

 from ansible.module_utils import baremetal_deploy as bd
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_cloud_from_module
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs

 import metalsmith

--- a/tripleo_ansible/ansible_plugins/modules/tripleo_build_heat_environment.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_build_heat_environment.py
@ -15,9 +15,9 @@ import yaml

 from ansible.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from heatclient.common import template_utils

--- a/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py
@ -22,9 +22,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_config_download.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_config_download.py
@ -19,9 +19,9 @@ import yaml

 from ansible.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from tripleo_common.utils import config as ooo_config

--- a/tripleo_ansible/ansible_plugins/modules/tripleo_container_image_prepare.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_container_image_prepare.py
@ -20,8 +20,8 @@ import logging
 import os

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs

 from tripleo_common import constants
 from tripleo_common.image import image_uploader
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_fernet_keys_rotate.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_fernet_keys_rotate.py
@ -19,9 +19,9 @@ import yaml

 from ansible.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from tripleo_common.utils import plan as plan_utils

--- a/tripleo_ansible/ansible_plugins/modules/tripleo_generate_ansible_inventory.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_generate_ansible_inventory.py
@ -19,9 +19,9 @@ import yaml

 from ansible.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from tripleo_common import inventory as inventory

--- a/tripleo_ansible/ansible_plugins/modules/tripleo_generate_inventory_network_config.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_generate_inventory_network_config.py
@ -20,7 +20,7 @@ import traceback
 import yaml

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_get_dpdk_core_list.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_get_dpdk_core_list.py
@ -17,9 +17,9 @@
 __metaclass__ = type

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_get_dpdk_nics_numa_info.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_get_dpdk_nics_numa_info.py
@ -21,9 +21,9 @@ try:
    from ansible.module_utils import tripleo_common_utils as tc
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import tripleo_common_utils as tc
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_get_dpdk_socket_memory.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_get_dpdk_socket_memory.py
@ -17,9 +17,9 @@
 __metaclass__ = type

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_get_flavor_profile.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_get_flavor_profile.py
@ -15,9 +15,9 @@

 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils import tripleo_common_utils as tc
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 DOCUMENTATION = """
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_get_host_cpus.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_get_host_cpus.py
@ -17,9 +17,9 @@
 __metaclass__ = type

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_get_introspected_data.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_get_introspected_data.py
@ -15,9 +15,9 @@

 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils import tripleo_common_utils as tc
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 DOCUMENTATION = """
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_list_overclouds.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_list_overclouds.py
@ -26,9 +26,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from heatclient import exc as heat_exc
 from tripleo_common import inventory as inventory
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_network_populate_environment.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_network_populate_environment.py
@ -19,9 +19,9 @@ import os
 import yaml

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_network_ports_populate_environment.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_network_ports_populate_environment.py
@ -19,9 +19,9 @@ import os
 import yaml

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_nova_image_cache.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_nova_image_cache.py
@ -16,9 +16,9 @@
 __metaclass__ = type

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_cloud_from_module
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
 import datetime
 import hashlib
 import os
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_extract.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_extract.py
@ -22,9 +22,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2 as n_utils  # noqa
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_ports.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_ports.py
@ -24,9 +24,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2 as n_utils  # noqa
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_vip_extract.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_vip_extract.py
@ -23,9 +23,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2 as n_utils  # noqa
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_vip_populate_environment.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_vip_populate_environment.py
@ -42,9 +42,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2 as n_utils  # noqa
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_vip_provision.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_overcloud_network_vip_provision.py
@ -24,9 +24,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2 as n_utils  # noqa
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_ovn_mac_addresses.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_ovn_mac_addresses.py
@ -24,9 +24,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_passwords_rotate.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_passwords_rotate.py
@ -19,9 +19,9 @@ import yaml

 from ansible.module_utils import tripleo_common_utils as tc
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 from tripleo_common.utils import plan as plan_utils

--- a/tripleo_ansible/ansible_plugins/modules/tripleo_service_vip.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_service_vip.py
@ -23,9 +23,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_unmanaged_populate_environment.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_unmanaged_populate_environment.py
@ -18,8 +18,8 @@
 import yaml

 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs

 ANSIBLE_METADATA = {
    'metadata_version': '1.1',
--- a/tripleo_ansible/ansible_plugins/modules/tripleo_unprovision_network.py
+++ b/tripleo_ansible/ansible_plugins/modules/tripleo_unprovision_network.py
@ -22,9 +22,9 @@ try:
 except ImportError:
    from tripleo_ansible.ansible_plugins.module_utils import network_data_v2
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.openstack import openstack_full_argument_spec
-from ansible.module_utils.openstack import openstack_module_kwargs
-from ansible.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module


 ANSIBLE_METADATA = {
--- a/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml
+++ b/tripleo_ansible/roles/tripleo_container_manage/molecule/default/converge.yml
@ -180,6 +180,8 @@
        state: stopped
        enabled: false
        daemon_reload: true
+      # https://github.com/ansible/ansible/pull/68136
+      ignore_errors: "{{ ansible_check_mode }}"
    - include_role:
        name: tripleo_container_manage
  post_tasks:
--- a/tripleo_ansible/roles/tripleo_podman/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_podman/tasks/main.yml
@ -17,12 +17,6 @@
 - name: Load vars
  import_tasks: load_vars.yaml

- name: Remove docker containers
-  import_tasks: tripleo_docker_stop.yml
-
- name: Purge Docker
-  import_tasks: tripleo_docker_purge.yml
-
 - name: Podman install
  import_tasks: tripleo_podman_install.yml

--- a/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_purge.yml
+++ b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_purge.yml
@ -1,71 +0,0 @@
---
-# Copyright 2019 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
- name: Load vars if needed
-  when: tripleo_podman_purge_packages is undefined or tripleo_podman_purge_packages|length == 0
-  import_tasks: load_vars.yaml
-
- name: Check if docker has some data
-  stat:
-    path: /var/lib/docker
-  register: docker_path_stat
-
- name: Docker purge block
-  when:
-    - docker_path_stat.stat.exists | bool
-  become: true
-  block:
-    - name: Check docker service state
-      systemd:
-        name: docker
-      register: docker_service_state
-
-    - name: Run docker system prune
-      shell: docker system prune -a -f
-      when:
-        - (docker_service_state.status['SubState'] | lower) == 'running'
-
-    - name: Stop and disable Docker service
-      systemd:
-        name: docker
-        state: stopped
-        enabled: false
-      when:
-        - (docker_service_state.status['ActiveState'] | lower) != 'inactive'
-
-    - name: Uninstall Docker rpm
-      package:
-        name: "{{ tripleo_podman_purge_packages }}"
-        state: absent
-
-    - name: Refresh hardware facts
-      setup:
-        gather_subset:
-          - '!all'
-          - '!min'
-          - hardware
-        filter: 'ansible_mounts'
-
-    - name: Un-mount docker directories
-      mount:
-        path: "{{ item.mount }}"
-        state: unmounted
-      loop: "{{ ansible_facts['mounts'] | selectattr('mount', 'search', 'docker') | list }}"
-
-    - name: Purge /var/lib/docker
-      file:
-        path: /var/lib/docker
-        state: absent
--- a/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_stop.yml
+++ b/tripleo_ansible/roles/tripleo_podman/tasks/tripleo_docker_stop.yml
@ -1,40 +0,0 @@
---
-# Copyright 2019 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-
- name: Docker containers stop block
-  tags:
-    - never
-    - system_upgrade_prepare
-  become: true
-  block:
-    - name: Check if docker is enabled in the system
-      stat:
-        path: "/var/run/docker.sock"
-      register: check_docker
-      failed_when: false
-
-    - name: Stop all services by stopping all Docker containers
-      command: docker ps -aq
-      register: running_containers
-      when: check_docker.stat.exists
-
-    - name: Stop a container
-      docker_container:
-        name: "{{ item }}"
-        state: stopped
-      loop: "{{ running_containers.stdout_lines | default([]) }}"
-      when: check_docker.stat.exists