From c1aca493652739a62993e6908ff78365aa4948aa Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 10:27:38 -0500
Subject: [PATCH 1/3] Define ANSIBLE_ROLES_PATH for the ansible provisioner

Molecule used to modify the roles path for us, but as of v25.2.0 no
longer does.  (See ansible/molecule#4380 for details.)  As a result we
must now modify it ourselves.
---
 molecule/default/molecule.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 5b7b542..cf72917 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -220,6 +220,10 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
+provisioner:
+  name: ansible
+  env:
+    ANSIBLE_ROLES_PATH: ~/.cache/molecule/skeleton-ansible-role/${MOLECULE_SCENARIO_NAME}/roles:${MOLECULE_PROJECT_DIRECTORY}/..:~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
 scenario:
   name: default
 verifier:

From cbfbd52074db23f7488c35d26607035b8e873638 Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 13:00:33 -0500
Subject: [PATCH 2/3] Add a comment explaining why we now have to set
 ANSIBLE_ROLES_PATH

---
 molecule/default/molecule.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index cf72917..1032ba7 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -223,6 +223,11 @@ platforms:
 provisioner:
   name: ansible
   env:
+    # Molecule used to add ${MOLECULE_PROJECT_DIRECTORY}/. to this
+    # path for us pre-25.2.0, but now we have to do it ourselves.  See
+    # ansible/molecule#4380 and
+    # https://github.com/ansible/molecule/releases/tag/v25.2.0 for
+    # more details.
     ANSIBLE_ROLES_PATH: ~/.cache/molecule/skeleton-ansible-role/${MOLECULE_SCENARIO_NAME}/roles:${MOLECULE_PROJECT_DIRECTORY}/..:~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
 scenario:
   name: default

From a2fe65dcfe9f10d3aa3d9935eb0448f4b1cde877 Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 23:09:56 -0500
Subject: [PATCH 3/3] Copy cisagov/skeleton-ansible-role#221 changes to
 non-default scenarios

---
 molecule/disable_stub_resolver/molecule.yml      | 9 +++++++++
 molecule/specify_resolv_conf_target/molecule.yml | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/molecule/disable_stub_resolver/molecule.yml b/molecule/disable_stub_resolver/molecule.yml
index 27a103b..7782a03 100644
--- a/molecule/disable_stub_resolver/molecule.yml
+++ b/molecule/disable_stub_resolver/molecule.yml
@@ -222,6 +222,15 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
+provisioner:
+  name: ansible
+  env:
+    # Molecule used to add ${MOLECULE_PROJECT_DIRECTORY}/. to this
+    # path for us pre-25.2.0, but now we have to do it ourselves.  See
+    # ansible/molecule#4380 and
+    # https://github.com/ansible/molecule/releases/tag/v25.2.0 for
+    # more details.
+    ANSIBLE_ROLES_PATH: ~/.cache/molecule/skeleton-ansible-role/${MOLECULE_SCENARIO_NAME}/roles:${MOLECULE_PROJECT_DIRECTORY}/..:~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
 scenario:
   name: disable_stub_resolver
 verifier:
diff --git a/molecule/specify_resolv_conf_target/molecule.yml b/molecule/specify_resolv_conf_target/molecule.yml
index 4b8f93a..898224d 100644
--- a/molecule/specify_resolv_conf_target/molecule.yml
+++ b/molecule/specify_resolv_conf_target/molecule.yml
@@ -222,6 +222,15 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
+provisioner:
+  name: ansible
+  env:
+    # Molecule used to add ${MOLECULE_PROJECT_DIRECTORY}/. to this
+    # path for us pre-25.2.0, but now we have to do it ourselves.  See
+    # ansible/molecule#4380 and
+    # https://github.com/ansible/molecule/releases/tag/v25.2.0 for
+    # more details.
+    ANSIBLE_ROLES_PATH: ~/.cache/molecule/skeleton-ansible-role/${MOLECULE_SCENARIO_NAME}/roles:${MOLECULE_PROJECT_DIRECTORY}/..:~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
 scenario:
   name: specify_resolv_conf_target
 verifier: