Regernerate CI, fix molecule and tox.

robertdebock · May 11, 2021 · 3f91bf8 · 3f91bf8
1 parent 9d16f66
commit 3f91bf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -22,9 +22,5 @@ platforms:
     pre_build_image: yes
 provisioner:
   name: ansible
-  config_options:
-    defaults:
-      stdout_callback: yaml
-      bin_ansible_callbacks: yes
 verifier:
   name: ansible
diff --git a/tox.ini b/tox.ini
@@ -3,16 +3,15 @@
 #
 [tox]
 minversion = 3.21.4
-# 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}
 
 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.*
@@ -23,4 +22,4 @@ setenv =
     ANSIBLE_FORCE_COLOR=1
     ANSIBLE_ROLES_PATH=../
 
-passenv = namespace image tag
+passenv = namespace image tag DOCKER_HOST