From f1eb19766c3d3251894105c6e55cea07eab89500 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Wed, 21 Aug 2024 13:44:21 +0200 Subject: [PATCH] Releasing version constraint to allow versions >= 2.15.0 Previously deprecated callback_whitelist configuration option was replaced with callback callbacks_enabled in 2.15.0. Upstream ee image was moved to tag 0.21.0 Signed-off-by: Jiri Podivin --- docs/docs-requirements.txt | 2 +- meta/runtime.yml | 2 +- molecule-requirements.txt | 2 +- openstack_ansibleee/Dockerfile | 4 ++-- roles/edpm_bootstrap/molecule/molecule_config.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/docs-requirements.txt b/docs/docs-requirements.txt index c0f03a8e8..1ea9869fc 100644 --- a/docs/docs-requirements.txt +++ b/docs/docs-requirements.txt @@ -1,5 +1,5 @@ # this is required for the docs build jobs -ansible-core==2.14.6 +ansible-core>=2.15.0 sphinx>=2.0.0,!=2.1.0 # BSD reno>=3.1.0 # Apache-2.0 doc8>=0.8.1 # Apache-2.0 diff --git a/meta/runtime.yml b/meta/runtime.yml index 069122f01..5e62f0608 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1,3 +1,3 @@ --- -requires_ansible: ">=2.14.0,<2.15.0" +requires_ansible: ">=2.15.0" diff --git a/molecule-requirements.txt b/molecule-requirements.txt index 51b141814..93a16a6f9 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -1,4 +1,4 @@ -ansible-core==2.14.6 +ansible-core>=2.15.0 molecule>=5.1.0,<6.0.0 molecule-plugins[podman,vagrant]>=23.5.0 pytest-testinfra diff --git a/openstack_ansibleee/Dockerfile b/openstack_ansibleee/Dockerfile index 7ba8c874f..fe2f5ef66 100644 --- a/openstack_ansibleee/Dockerfile +++ b/openstack_ansibleee/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/ansible/creator-ee:v0.14.1 as builder +FROM quay.io/ansible/creator-ee:v0.21.0 as builder ARG REMOTE_SOURCE=. ARG REMOTE_SOURCE_DIR=/var/tmp/edpm-ansible @@ -8,7 +8,7 @@ RUN cd $REMOTE_SOURCE_DIR && \ ansible-galaxy collection install -U --timeout 120 -r requirements.yml --collections-path "/usr/share/ansible/collections" && \ ansible-galaxy collection install -U $REMOTE_SOURCE_DIR --collections-path "/usr/share/ansible/collections" -FROM quay.io/ansible/creator-ee:v0.14.1 as runner +FROM quay.io/ansible/creator-ee:v0.21.0 as runner RUN \ microdnf install -y \ diff --git a/roles/edpm_bootstrap/molecule/molecule_config.yaml b/roles/edpm_bootstrap/molecule/molecule_config.yaml index f2390842f..6ebafb922 100644 --- a/roles/edpm_bootstrap/molecule/molecule_config.yaml +++ b/roles/edpm_bootstrap/molecule/molecule_config.yaml @@ -22,7 +22,7 @@ provisioner: log: true config_options: interpreter_python: auto_silent - callback_whitelist: profile_tasks, timer, yaml + callbacks_enabled: profile_tasks, timer, yaml env: ANSIBLE_STDOUT_CALLBACK: yaml