From d5d948363752f9aa6dee0aa8bd29f1d28c42ac1e Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert@meinit.nl>
Date: Fri, 14 May 2021 09:47:59 +0200
Subject: [PATCH] Don't mention requirements-file, it breaks molecule.

---
 templates/molecule.yml.j2 | 7 -------
 templates/tox.ini.j2      | 9 ++++-----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/templates/molecule.yml.j2 b/templates/molecule.yml.j2
index 0ba89ab..5e69912 100644
--- a/templates/molecule.yml.j2
+++ b/templates/molecule.yml.j2
@@ -4,9 +4,6 @@ dependency:
   name: galaxy
   options:
     role-file: requirements.yml
-{% if requirements.collections is defined %}
-    requirements-file: requirements.yml
-{% endif %}
 lint: |
   set -e
   yamllint .
@@ -23,10 +20,6 @@ platforms:
     pre_build_image: yes
 provisioner:
   name: ansible
-  config_options:
-    defaults:
-      stdout_callback: yaml
-      bin_ansible_callbacks: yes
 {% if verify.stat.exists  %}
 verifier:
   name: ansible
diff --git a/templates/tox.ini.j2 b/templates/tox.ini.j2
index 91f799b..e3a640f 100644
--- a/templates/tox.ini.j2
+++ b/templates/tox.ini.j2
@@ -4,8 +4,7 @@ minversion = 3.21.4
 {% if tox_versions is defined %}
 envlist = py{39}-ansible-{% raw %}{{% endraw %}{% for version in tox_versions %}{{ version }}{% if not loop.last %},{% endif %}{% endfor %}{% raw %}}{% endraw %}
 {% else %}
-# 2.11 has been disabled: couldn't resolve module/action 'docker_container'.
-envlist = py{39}-ansible-{2.9,2.10}
+envlist = py{39}-ansible-{2.9,2.10,2.11}
 {% endif %}
 
 skipsdist = true
@@ -13,8 +12,8 @@ skipsdist = true
 [testenv]
 deps =
     2.9: ansible == 2.9.*
-    2.10: ansible == 2.10.*
-    2.11: git+https://github.com/ansible/ansible.git@devel
+    2.10: ansible-base == 2.10.*
+    2.11: ansible-core == 2.11.*
     molecule[docker]
     docker == 4.*
     ansible-lint == 5.*
@@ -25,4 +24,4 @@ setenv =
     ANSIBLE_FORCE_COLOR=1
     ANSIBLE_ROLES_PATH=../
 
-passenv = namespace image tag
+passenv = namespace image tag DOCKER_HOST