From 0e740a1f45c554046ba80dfec308b9ba0cd54066 Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Fri, 23 Apr 2021 13:10:46 -0400 Subject: [PATCH] Enable the ansible turbo module (#68) - enable the AnsibleTurboModule: Use AnsibleTurboModule when the `cloud.common` collection is available. - Add dependency install step to molecule: Molecule won't install dependencies from galaxy.yml. We need to explicitly list them in a requirements.yml file and then enable the dependency step for molecule test. --- galaxy.yml | 3 ++- molecule/default/molecule.yml | 5 +++++ plugins/module_utils/ansiblemodule.py | 8 +++++++- requirements.yml | 2 ++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 requirements.yml diff --git a/galaxy.yml b/galaxy.yml index d8dd928a..7212f56f 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,8 @@ authors: - willthames (https://github.com/willthames) - mmazur (https://github.com/mmazur) - jamescassell (https://github.com/jamescassell) -dependencies: {} +dependencies: + - cloud.common description: Kubernetes Collection for Ansible. documentation: '' homepage: '' diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 15895965..e6b1cddc 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -32,7 +32,12 @@ provisioner: scenario: name: default test_sequence: + - dependency - lint - syntax - converge - verify +dependency: + name: galaxy + options: + requirements-file: requirements.yml diff --git a/plugins/module_utils/ansiblemodule.py b/plugins/module_utils/ansiblemodule.py index a647b163..97fc7604 100644 --- a/plugins/module_utils/ansiblemodule.py +++ b/plugins/module_utils/ansiblemodule.py @@ -3,4 +3,10 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible.module_utils.basic import AnsibleModule # noqa: F401 +try: + from ansible_collections.cloud.common.plugins.module_utils.turbo.module import ( + AnsibleTurboModule as AnsibleModule, + ) # noqa: F401 + AnsibleModule.collection_name = "kubernetes.core" +except ImportError: + from ansible.module_utils.basic import AnsibleModule # noqa: F401 diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 00000000..450cdbc4 --- /dev/null +++ b/requirements.yml @@ -0,0 +1,2 @@ +collections: + - cloud.common