molecule-plugins 23.5.3__tar.gz → 23.7.0__tar.gz

molecule_plugins-23.7.0/.github/workflows/ack.yml

@@ -0,0 +1,15 @@
+---
+# See https://github.com/ansible/team-devtools/blob/main/.github/workflows/ack.yml
+name: ack
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request_target:
+    types: [opened, labeled, unlabeled, synchronize]
+
+jobs:
+  ack:
+    uses: ansible/team-devtools/.github/workflows/ack.yml@main

molecule_plugins-23.7.0/.github/workflows/push.yml

@@ -0,0 +1,13 @@
+---
+# See https://github.com/ansible/team-devtools/blob/main/.github/workflows/push.yml
+name: push
+on:
+  push:
+    branches:
+      - main
+      - "releases/**"
+      - "stable/**"
+
+jobs:
+  ack:
+    uses: ansible/team-devtools/.github/workflows/push.yml@main

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/.github/workflows/release.yml

@@ -1,3 +1,4 @@
+---
 name: release
 
 on:
@@ -18,10 +19,10 @@ jobs:
       TOX_PARALLEL_NO_SPINNER: 1
 
     steps:
-      - name: Switch to using Python 3.9 by default
+      - name: Switch to using Python 3.10 by default
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Install tox
         run: >-

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/.github/workflows/tox.yml

@@ -1,3 +1,4 @@
+---
 name: tox
 
 # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency
@@ -22,9 +23,9 @@ jobs:
         id: generate_matrix
         uses: coactions/dynamic-matrix@v1
         with:
-          min_python: "3.9"
+          min_python: "3.10"
           max_python: "3.12"
-          default_python: "3.9" # used by jobs in other_names
+          default_python: "3.10" # used by jobs in other_names
           other_names: |
             lint
             pkg
@@ -40,7 +41,8 @@ jobs:
       matrix: ${{ fromJson(needs.pre.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # needed by setuptools-scm
 

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/.gitignore

@@ -131,3 +131,10 @@ src/molecule_plugins/_version.py
 
 # Ignore generated files
 test/roles
+
+# Quilt/Patch generated files
+.pc
+patches
+*.patch
+*.orig
+*.rej

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: molecule-plugins
-Version: 23.5.3
+Version: 23.7.0
 Summary: Molecule Plugins
 Author-email: Sorin Sbarnea <sorin.sbarnea@gmail.com>
 Maintainer-email: Sorin Sbarnea <sorin.sbarnea@gmail.com>
@@ -19,7 +19,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -29,13 +28,13 @@ Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: molecule>=6.0.0a1
+Requires-Dist: molecule>=25.1.0
 Provides-Extra: test
 Requires-Dist: pytest-helpers-namespace>=2019.1.8; extra == "test"
-Requires-Dist: molecule[test]>=6.0.0a1; extra == "test"
+Requires-Dist: molecule[test]>=25.1.0; extra == "test"
 Provides-Extra: azure
 Provides-Extra: docker
 Requires-Dist: selinux; sys_platform == "linux2" and extra == "docker"
@@ -44,6 +43,8 @@ Requires-Dist: docker>=4.3.1; extra == "docker"
 Requires-Dist: requests; extra == "docker"
 Provides-Extra: ec2
 Provides-Extra: gce
+Requires-Dist: requests>=2.31.0; extra == "gce"
+Requires-Dist: google-auth>=2.28.2; extra == "gce"
 Provides-Extra: podman
 Provides-Extra: selinux
 Requires-Dist: selinux; sys_platform == "linux2" and extra == "selinux"
@@ -66,7 +67,6 @@ This repository contains the following molecule plugins:
 - podman
 - vagrant
 
-
 Installing `molecule-plugins` does not install dependencies specific to each,
 plugin. To install these you need to install the extras for each plugin, like
 `pip3 install 'molecule-plugins[azure]'`.
@@ -75,3 +75,27 @@ Before installing these plugins be sure that you uninstall their old standalone
 packages, like `pip3 uninstall molecule-azure`. If you fail to do so, you will
 end-up with a broken setup, as multiple plugins will have the same entry points,
 registered.
+
+## Creating new releases
+
+The `release.yml` workflow generates the wheel and uploads the release to PyPI.
+Here are the steps you need to kick that process off:
+
+1. Review the commit logs and decide on the next version.
+   - Breaking changes should increment to a new major version.
+   - New features should increment to a new minor version.
+   - Bug fixes and small changes should increment to a new patch version.
+
+2. Create a new tag and push it to the repo.
+
+   ```bash
+   git tag -s <NEW_VERSION> -m "Tag message"
+   git push --tags upstream
+   ```
+
+   > It is possible to create lightweight tags using `git tag <NEW_VERSION>` but signed tags are preferred.
+
+3. Publish the release with either the GitHub CLI or in a browser.
+   See the [GitHub documentation about managing releases](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository).
+4. Check the [release workflow](https://github.com/ansible-community/molecule-plugins/actions/workflows/release.yml) runs successfully.
+5. Verify the new version is available from the [molecule-plugins](https://pypi.org/project/molecule-plugins/) page on PyPI.

molecule_plugins-23.7.0/README.md

@@ -0,0 +1,45 @@
+# molecule-plugins
+
+This repository contains the following molecule plugins:
+
+- azure
+- containers
+- docker
+- ec2
+- gce
+- openstack
+- podman
+- vagrant
+
+Installing `molecule-plugins` does not install dependencies specific to each,
+plugin. To install these you need to install the extras for each plugin, like
+`pip3 install 'molecule-plugins[azure]'`.
+
+Before installing these plugins be sure that you uninstall their old standalone
+packages, like `pip3 uninstall molecule-azure`. If you fail to do so, you will
+end-up with a broken setup, as multiple plugins will have the same entry points,
+registered.
+
+## Creating new releases
+
+The `release.yml` workflow generates the wheel and uploads the release to PyPI.
+Here are the steps you need to kick that process off:
+
+1. Review the commit logs and decide on the next version.
+   - Breaking changes should increment to a new major version.
+   - New features should increment to a new minor version.
+   - Bug fixes and small changes should increment to a new patch version.
+
+2. Create a new tag and push it to the repo.
+
+   ```bash
+   git tag -s <NEW_VERSION> -m "Tag message"
+   git push --tags upstream
+   ```
+
+   > It is possible to create lightweight tags using `git tag <NEW_VERSION>` but signed tags are preferred.
+
+3. Publish the release with either the GitHub CLI or in a browser.
+   See the [GitHub documentation about managing releases](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository).
+4. Check the [release workflow](https://github.com/ansible-community/molecule-plugins/actions/workflows/release.yml) runs successfully.
+5. Verify the new version is available from the [molecule-plugins](https://pypi.org/project/molecule-plugins/) page on PyPI.

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/conftest.py

@@ -3,10 +3,12 @@ import os
 import random
 import shutil
 import string
+from pathlib import Path
 
 import pytest
 
-from molecule import config, logger, util
+from molecule import config, logger
+from molecule.app import get_app
 from molecule.scenario import ephemeral_directory
 
 LOG = logger.get_logger(__name__)
@@ -18,7 +20,7 @@ def run_command(cmd, env=os.environ, log=True):
         if log:
             cmd = _rebake_command(cmd, env)
         cmd = cmd.bake(_truncate_exc=False)
-    return util.run_command(cmd, env=env)
+    return get_app(Path()).run_command(cmd, env=env)
 
 
 def _rebake_command(cmd, env, out=LOG.info, err=LOG.error):

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/doc/openstack/platforms.rst

@@ -43,6 +43,12 @@ security_group.rules[].port_min Starting port (can't be used with port)
 security_group.rules[].port_max Ending port (can't be used with port)
 security_group.rules[].type     IPv4 or IPv6, default 'IPv4'
 user                            Default user of image
+auto_ip                         Ensure instance has public IP, mutually \
+                                exclusive with floating_ip_pools, \
+                                default = true
+floating_ip_pools               List of floating pool IP names to choose a \
+                                floating IP from, mutually exclusive with \
+                                auto_ip, (optional)
 volume                          Mapping of volume settings (optional if \
                                 flavor provides volume)
 volume.size                     Size of volume (GB)
@@ -96,6 +102,8 @@ Examples
         flavor: m1.small
         image: Debian_10
         user: debian
+        floating_ip_pools: # mutually exclusive with auto_ip
+          - 1.2.3.4
         network:
           name: molecule
           router:
@@ -139,9 +147,10 @@ Examples
         network:
           name: molecule # use network from debian10 instance
       - name: ubuntu2004
-        falvor: m1.tiny
+        flavor: m1.tiny
         image: Ubuntu_2004
         user: ubuntu
+        auto_ip: false # do not assign a public IP
         security_group:
           name: molecule # use security group from debian10 instance
         network:

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/molecule/test-podman/molecule.yml

@@ -5,7 +5,7 @@ driver:
   name: podman
 platforms:
   - name: instance
-    image: docker.io/pycontribs/centos:8
+    image: quay.io/centos/centos:stream9
     pre_build_image: true
     published_ports:
       - 127.0.0.1:2080:80

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 # https://peps.python.org/pep-0621/#readme
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dynamic = ["version"]
 name = "molecule-plugins"
 description = "Molecule Plugins"
@@ -26,7 +26,6 @@ classifiers = [
   "Operating System :: MacOS",
   "Operating System :: POSIX",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -40,7 +39,7 @@ classifiers = [
 keywords = ["ansible", "testing", "molecule", "plugin"]
 dependencies = [
     # molecule plugins are not allowed to mention Ansible as a direct dependency
-    "molecule >= 6.0.0a1",
+    "molecule >= 25.1.0",
 ]
 
 [project.urls]
@@ -52,7 +51,7 @@ changelog = "https://github.com/ansible-community/molecule-plugins/releases"
 [project.optional-dependencies]
 test = [
     "pytest-helpers-namespace >= 2019.1.8",
-    "molecule[test] >= 6.0.0a1"
+    "molecule[test] >= 25.1.0"
 ]
 azure = []
 docker = [
@@ -66,7 +65,10 @@ docker = [
     "requests"  # also required by docker
 ]
 ec2 = []
-gce = []
+gce = [
+    "requests >= 2.31.0",
+    "google-auth >= 2.28.2",
+]
 podman = [
 ]
 selinux = [
@@ -86,7 +88,7 @@ openstack = [
 ]
 
 [tool.ruff]
-ignore = [
+lint.ignore = [
   "E501", # we use black
   # we deliberately ignore these:
   "EM102",
@@ -98,6 +100,7 @@ ignore = [
   "B028",
   "BLE",
   "C901",
+  "COM812",
   "D",
   "DTZ",
   "FBT",
@@ -116,15 +119,15 @@ ignore = [
   "FIX002",
   "TRY",
 ]
-select = ["ALL"]
+lint.select = ["ALL"]
 target-version = "py39"
 # Same as Black.
 line-length = 88
 
-[tool.ruff.flake8-pytest-style]
+[tool.ruff.lint.flake8-pytest-style]
 parametrize-values-type = "tuple"
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["molecule_plugins"]
 
 [project.entry-points."molecule.driver"]

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/requirements.yml

@@ -4,7 +4,7 @@ collections:
   - name: google.cloud
   - name: amazon.aws
   - name: community.docker
-    version: ">=3.4.11"
+    version: ">=3.10.2"
   - name: containers.podman
   - name: azure.azcollection
     version: ">=1,<2"

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '23.5.3'
-__version_tuple__ = version_tuple = (23, 5, 3)
+__version__ = version = '23.7.0'
+__version_tuple__ = version_tuple = (23, 7, 0)

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/azure/driver.py

@@ -90,10 +90,10 @@ class Azure(Driver):
         connection_options = " ".join(self.ssh_connection_options)
 
         return (
-            "ssh {{address}} "
-            "-l {{user}} "
-            "-p {{port}} "
-            "-i {{identity_file}} "
+            "ssh {address} "
+            "-l {user} "
+            "-p {port} "
+            "-i {identity_file} "
             f"{connection_options}"
         )
 

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/docker/driver.py

@@ -19,7 +19,6 @@
 #  DEALINGS IN THE SOFTWARE.
 """Docker Driver Module."""
 
-
 import os
 
 from molecule import logger
@@ -119,6 +118,8 @@ class Docker(Driver):
             restart_retries: 1
             buildargs:
                 http_proxy: http://proxy.example.com:8080/
+            cache_from:
+              - registry.example.com/example/example:main
 
     If specifying the `CMD`_ directive in your ``Dockerfile.j2`` or consuming a
     built image which declares a ``CMD`` directive, then you must set
@@ -253,7 +254,11 @@ class Docker(Driver):
         self._passed_sanity = True
 
     def reset(self):
-        import docker
+        # maybe use self.sanity_check instead?
+        try:
+            import docker
+        except ImportError:
+            return
 
         client = docker.from_env()
         for c in client.containers.list(filters={"label": "owner=molecule"}):
@@ -270,4 +275,4 @@ class Docker(Driver):
     def required_collections(self) -> dict[str, str]:
         """Return collections dict containing names and versions required."""
         # https://galaxy.ansible.com/community/docker
-        return {"community.docker": "3.4.11", "ansible.posix": "1.4.0"}
+        return {"community.docker": "3.10.2", "ansible.posix": "1.4.0"}

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/docker/playbooks/create.yml

@@ -27,6 +27,8 @@
         key_path: "{{ item.key_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/key.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
         tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
       with_items: "{{ molecule_yml.platforms }}"
+      loop_control:
+        label: "{{ item.registry.url | default(item.name) }}"
       when:
         - item.registry is defined
         - item.registry.url is defined and item.registry.url
@@ -38,6 +40,8 @@
       ansible.builtin.stat:
         path: "{{ molecule_scenario_directory + '/' + (item.dockerfile | default('Dockerfile.j2')) }}"
       loop: "{{ molecule_yml.platforms }}"
+      loop_control:
+        label: "{{ item.name }}"
       register: dockerfile_stats
 
     - name: Create Dockerfiles from image names
@@ -52,6 +56,7 @@
         mode: "0600"
       loop: "{{ molecule_yml.platforms }}"
       loop_control:
+        label: "{{ item.name }}"
         index_var: i
       when: not item.pre_build_image | default(false)
       register: platforms
@@ -68,6 +73,7 @@
           - "--exclude=molecule.yml"
       loop: "{{ molecule_yml.platforms }}"
       loop_control:
+        label: "{{ item.name }}"
         index_var: i
       when: not item.pre_build_image | default(false)
       delegate_to: localhost
@@ -81,6 +87,8 @@
         key_path: "{{ item.key_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/key.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
         tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
       with_items: "{{ platforms.results }}"
+      loop_control:
+        label: "{{ item.item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
       when:
         - not item.pre_build_image | default(false)
       register: docker_images
@@ -104,6 +112,7 @@
           network: "{{ item.item.network_mode | default(omit) }}"
           args: "{{ item.item.buildargs | default(omit) }}"
           platform: "{{ item.item.platform | default(omit) }}"
+          cache_from: "{{ item.item.cache_from | default(omit) }}"
         name: "molecule_local/{{ item.item.image }}"
         docker_host: "{{ item.item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
         cacert_path: "{{ item.cacert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/ca.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
@@ -128,6 +137,8 @@
              combine({item.name: item.command | default('bash -c "while true; do sleep 10000; done"')})
           }}
       with_items: "{{ molecule_yml.platforms }}"
+      loop_control:
+        label: "{{ item.name }}"
       when: item.override_command | default(true)
 
     - name: Create molecule instance(s)
@@ -199,3 +210,5 @@
       until: docker_jobs.finished
       retries: 300
       with_items: "{{ server.results }}"
+      loop_control:
+        label: "{{ item.item.name }}"

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/docker/playbooks/validate-dockerfile.yml

@@ -9,7 +9,7 @@
       # platforms supported as being managed by molecule/ansible, this does
       # not mean molecule itself can run on them.
       - image: alpine:edge
-      - image: quay.io/centos/centos:stream8
+      - image: quay.io/centos/centos:stream9
       - image: ubuntu:latest
       - image: debian:latest
   tags:

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/ec2/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/create.yml

@@ -128,6 +128,8 @@
         type: rsa
         size: 2048
         regenerate: never
+        backend: cryptography
+        private_key_format: pkcs1
       loop: "{{ platforms }}"
       loop_control:
         label: "{{ item.name }}"

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/ec2/driver.py

@@ -182,7 +182,7 @@ class EC2(Driver):
                 '"/u:{}" '
                 '"/p:{}" '
                 "/v:{} "
-                "/cert-tofu "
+                "/cert:tofu "
                 "+clipboard "
                 "/grab-keyboard".format(
                     ansible_connection_options["ansible_user"],
@@ -195,10 +195,10 @@ class EC2(Driver):
             connection_options = " ".join(self.ssh_connection_options)
 
             return (
-                "ssh {{address}} "
-                "-l {{user}} "
-                "-p {{port}} "
-                "-i {{identity_file}} "
+                "ssh {address} "
+                "-l {user} "
+                "-p {port} "
+                "-i {identity_file} "
                 f"{connection_options}"
             )
 

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/gce/driver.py

@@ -94,10 +94,10 @@ class GCE(Driver):
         connection_options = " ".join(self.ssh_connection_options)
 
         return (
-            "ssh {{address}} "
-            "-l {{user}} "
-            "-p {{port}} "
-            "-i {{identity_file}} "
+            "ssh {address} "
+            "-l {user} "
+            "-p {port} "
+            "-i {identity_file} "
             f"{connection_options}"
         )
 

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/gce/playbooks/tasks/create_linux_instance.yml

@@ -28,6 +28,7 @@
         subnetwork:
           selfLink: "{{ gcp_snet }}"
         access_configs: "{{ [{'name': 'instance_ip', 'type': 'ONE_TO_ONE_NAT'}] if molecule_yml.driver.external_access else [] }}"
+    tags: "{{ item.tags | default(omit) }}"
     zone: "{{ item.zone | default(molecule_yml.driver.region + '-b') }}"
     project: "{{ gcp_project_id }}"
     scopes: "{{ molecule_yml.driver.scopes | default(['https://www.googleapis.com/auth/compute'], True) }}"
@@ -61,3 +62,7 @@
     search_regex: SSH
     delay: 10
   loop: "{{ server.results }}"
+  register: waitfor
+  until: waitfor.failed == false
+  retries: 6
+  delay: 10

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/gce/playbooks/tasks/create_windows_instance.yml

@@ -20,6 +20,7 @@
         subnetwork:
           selfLink: "{{ gcp_snet }}"
         access_configs: "{{ [{'name': 'instance_ip', 'type': 'ONE_TO_ONE_NAT'}] if molecule_yml.driver.external_access else [] }}"
+    tags: "{{ item.tags | default(omit) }}"
     zone: "{{ item.zone | default(molecule_yml.driver.region + '-b') }}"
     project: "{{ gcp_project_id }}"
     scopes: "{{ molecule_yml.driver.scopes | default(['https://www.googleapis.com/auth/compute'], True) }}"
@@ -50,6 +51,10 @@
     host: "{{ item.networkInterfaces.0.accessConfigs.0.natIP if molecule_yml.driver.external_access else item.networkInterfaces.0.networkIP }}"
     delay: 10
   loop: "{{ server.results }}"
+  register: waitfor
+  until: waitfor.failed == false
+  retries: 6
+  delay: 10
 
 - name: Prepare Windows User
   ansible.builtin.script: >

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/openstack/driver.py

@@ -27,6 +27,8 @@ class Openstack(Driver):
             flavor: m1.small
             image: Ubuntu_20.04
             user: ubuntu
+            floating_ip_pools: # mutually exclusive with auto_ip
+              - 1.2.3.4
             security_group:
                 name: molecule-sec
                 description: Molecule test

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/openstack/playbooks/create.yml

@@ -102,6 +102,8 @@
         image: "{{ item.image }}"
         key_name: "{{ key_name }}"
         flavor: "{{ item.flavor }}"
+        floating_ip_pools: "{{ item.floating_ip_pools if item.floating_ip_pools is defined and item.floating_ip_pools | length > 0 else omit }}"
+        auto_ip: "{{ item.auto_ip if item.auto_ip is defined else omit }}"
         boot_from_volume: "{{ true if item.volume is defined and item.volume.size else false }}"
         terminate_volume: "{{ true if item.volume is defined and item.volume.size else false }}"
         volume_size: "{{ item.volume.size if item.volume is defined and item.volume.size else omit }}"

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/podman/driver.py

@@ -19,9 +19,9 @@
 #  DEALINGS IN THE SOFTWARE.
 """Podman Driver Module."""
 
-
 import os
 import warnings
+from pathlib import Path
 from shutil import which
 
 from ansible_compat.runtime import Runtime
@@ -29,6 +29,7 @@ from packaging.version import Version
 
 from molecule import logger, util
 from molecule.api import Driver, MoleculeRuntimeWarning
+from molecule.app import get_app
 from molecule.constants import RC_SETUP_ERROR
 from molecule.util import sysexit_with_message
 
@@ -243,3 +244,9 @@ class Podman(Driver):
     def required_collections(self) -> dict[str, str]:
         """Return collections dict containing names and versions required."""
         return {"containers.podman": "1.7.0", "ansible.posix": "1.3.0"}
+
+    def reset(self):
+        # keep `--filter` in sync with playbooks/create.yml
+        get_app(Path()).run_command(
+            ["podman", "rm", "--force", "--filter=label=owner=molecule"]
+        )

{molecule-plugins-23.5.3 → molecule_plugins-23.7.0}/src/molecule_plugins/podman/playbooks/create.yml

@@ -77,6 +77,7 @@
             {% if item.item.pull is defined %}--pull={{ item.item.pull }}{% endif %}
           file: "{{ item.dest }}"
         name: "molecule_local/{{ item.item.image }}"
+        executable: "{{ podman_exec }}"
         path: "{{ molecule_scenario_directory }}"
         pull: "{{ item.item.pull | default(omit) }}"
       loop: "{{ platforms.results }}"
@@ -145,9 +146,11 @@
         etc_hosts: "{{ item.etc_hosts | default(omit) }}"
         executable: "{{ podman_exec }}"
         expose: "{{ item.exposed_ports | default(omit) }}"
-        hostname: "{{ item.hostname | default(omit) }}"
+        hostname: "{{ item.hostname | default(item.name) }}"
         image: "{{ item.pre_build_image | default(false) | ternary('', 'molecule_local/') }}{{ item.image }}"
         ip: "{{ item.ip | default(omit) }}"
+        label:
+          owner: "molecule" # keep in sync with ../driver.py:Podman.reset()
         network: "{{ item.network | default(omit) }}"
         pid: "{{ item.pid_mode | default(omit) }}"
         privileged: "{{ item.privileged | default(omit) }}"