From 6f736756243be28cb546cb68e92c8b7f6e075a88 Mon Sep 17 00:00:00 2001
From: Lewis Denny <lewisdenny@me.com>
Date: Wed, 23 Oct 2024 10:36:25 +1000
Subject: [PATCH] Update Molecule config for local use

- Change container name to instance to match what runs in CI so
  scenarios can be written to run locally and in CI without tweaks
- Remove unused TRIPLEO_ANSIBLE overrides
- Remove unused YAML anchors
---
 .config/molecule/config_podman.yml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/.config/molecule/config_podman.yml b/.config/molecule/config_podman.yml
index 3c79c54dd5..1a542f146b 100644
--- a/.config/molecule/config_podman.yml
+++ b/.config/molecule/config_podman.yml
@@ -5,20 +5,17 @@ driver:
 log: true
 
 platforms:
-  - name: centos
-    hostname: centos
-    image: ${TRIPLEO_ANSIBLE_MOLECULE_IMAGE:-"ubi9/ubi-init"}
+  - name: instance
+    hostname: instance
+    image: "ubi9/ubi-init"
     registry:
-      url: ${TRIPLEO_ANSIBLE_MOLECULE_REGISTRY:-"registry.access.redhat.com"}
-    dockerfile: Dockerfile.j2
-    pkg_extras: python*setuptools
-    command: ${TRIPLEO_ANSIBLE_MOLECULE_COMMAND:-"/sbin/init"}
-    volumes: ${TRIPLEO_ANSIBLE_MOLECULE_VOLUMES:-['/etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro','/etc/pki/rpm-gpg:/etc/pki/rpm-gpg:O','/opt/yum.repos.d:/etc/yum.repos.d:O','/etc/dnf/vars:/etc/dnf/vars:O']}
+      url: "registry.access.redhat.com"
+    command: "sleep infinity"
     privileged: true
-    environment: &env
+    environment:
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
       https_proxy: "{{ lookup('env', 'https_proxy') }}"
-    ulimits: &ulimit
+    ulimits:
       - host
 
 provisioner:
@@ -26,21 +23,12 @@ provisioner:
     hosts:
       all:
         hosts:
-          centos:
+          instance:
             ansible_python_interpreter: /usr/bin/python3
   name: ansible
   log: true
   env:
     ANSIBLE_STDOUT_CALLBACK: yaml
-    ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${HOME}/zuul-jobs/roles"
-    ANSIBLE_LIBRARY: "${ANSIBLE_LIBRARY:-/usr/share/ansible/plugins/modules}"
-    ANSIBLE_FILTER_PLUGINS: "${ANSIBLE_FILTER_PLUGINS:-/usr/share/ansible/plugins/filter}"
   config_options:
     defaults:
       remote_tmp: /tmp
-
-scenario:
-  test_sequence:
-    - prepare
-    - converge
-    - cleanup