From 024a3ee5518f028bec635da38f0724daa0511e2f Mon Sep 17 00:00:00 2001
From: Kenichi Omichi <ken1ohmichi@gmail.com>
Date: Thu, 9 Jun 2022 13:15:45 -0700
Subject: [PATCH] Replace callback_whitelist with callbacks_enabled (#8759)
When running molecule jobs, we saw the folloing warning message:
[DEPRECATION WARNING]: [defaults]callback_whitelist option, normalizing names
to new standard, use callbacks_enabled instead. This feature will be removed
from ansible-core in version 2.15. Deprecation warnings can be disabled by
setting deprecation_warnings=False in ansible.cfg.
callbacks_enabled has been added since Ansible 2.11 and Kubespray is using
Ansible 2.12 at master branch. So we can use callbacks_enabled safely to
avoid the warning message.
---
ansible.cfg | 2 +-
roles/adduser/molecule/default/molecule.yml | 2 +-
roles/bastion-ssh-config/molecule/default/molecule.yml | 2 +-
roles/bootstrap-os/molecule/default/molecule.yml | 2 +-
roles/container-engine/containerd/molecule/default/molecule.yml | 2 +-
.../container-engine/cri-dockerd/molecule/default/molecule.yml | 2 +-
roles/container-engine/cri-o/molecule/default/molecule.yml | 2 +-
roles/container-engine/docker/molecule/default/molecule.yml | 2 +-
roles/container-engine/gvisor/molecule/default/molecule.yml | 2 +-
.../kata-containers/molecule/default/molecule.yml | 2 +-
roles/container-engine/youki/molecule/default/molecule.yml | 2 +-
tests/ansible.cfg | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ansible.cfg b/ansible.cfg
index cec8bcec9..17c0f522f 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -14,7 +14,7 @@ fact_caching_timeout = 7200
stdout_callback = default
display_skipped_hosts = no
library = ./library
-callback_whitelist = profile_tasks,ara_default
+callbacks_enabled = profile_tasks,ara_default
roles_path = roles:$VIRTUAL_ENV/usr/local/share/kubespray/roles:$VIRTUAL_ENV/usr/local/share/ansible/roles:/usr/share/kubespray/roles
deprecation_warnings=False
inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo, .creds, .gpg
diff --git a/roles/adduser/molecule/default/molecule.yml b/roles/adduser/molecule/default/molecule.yml
index 80ebdad72..617677eec 100644
--- a/roles/adduser/molecule/default/molecule.yml
+++ b/roles/adduser/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ provisioner:
name: ansible
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/bastion-ssh-config/molecule/default/molecule.yml b/roles/bastion-ssh-config/molecule/default/molecule.yml
index c0c29ae92..5cadd6e64 100644
--- a/roles/bastion-ssh-config/molecule/default/molecule.yml
+++ b/roles/bastion-ssh-config/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ provisioner:
name: ansible
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml
index adba4ce4d..8413baae6 100644
--- a/roles/bootstrap-os/molecule/default/molecule.yml
+++ b/roles/bootstrap-os/molecule/default/molecule.yml
@@ -41,7 +41,7 @@ provisioner:
name: ansible
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml
index 48809a3a8..3071d265c 100644
--- a/roles/container-engine/containerd/molecule/default/molecule.yml
+++ b/roles/container-engine/containerd/molecule/default/molecule.yml
@@ -45,7 +45,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
index e99c23cc1..c82ddba9d 100644
--- a/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-dockerd/molecule/default/molecule.yml
@@ -29,7 +29,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index c46da7213..1c67a648c 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-o/molecule/default/molecule.yml
@@ -31,7 +31,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/docker/molecule/default/molecule.yml b/roles/container-engine/docker/molecule/default/molecule.yml
index 7f81d4847..c2c71cad2 100644
--- a/roles/container-engine/docker/molecule/default/molecule.yml
+++ b/roles/container-engine/docker/molecule/default/molecule.yml
@@ -21,7 +21,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/gvisor/molecule/default/molecule.yml b/roles/container-engine/gvisor/molecule/default/molecule.yml
index 14867fad5..5c3a7e175 100644
--- a/roles/container-engine/gvisor/molecule/default/molecule.yml
+++ b/roles/container-engine/gvisor/molecule/default/molecule.yml
@@ -29,7 +29,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/kata-containers/molecule/default/molecule.yml b/roles/container-engine/kata-containers/molecule/default/molecule.yml
index bb9812054..63a942b99 100644
--- a/roles/container-engine/kata-containers/molecule/default/molecule.yml
+++ b/roles/container-engine/kata-containers/molecule/default/molecule.yml
@@ -29,7 +29,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/roles/container-engine/youki/molecule/default/molecule.yml b/roles/container-engine/youki/molecule/default/molecule.yml
index 14867fad5..5c3a7e175 100644
--- a/roles/container-engine/youki/molecule/default/molecule.yml
+++ b/roles/container-engine/youki/molecule/default/molecule.yml
@@ -29,7 +29,7 @@ provisioner:
ANSIBLE_ROLES_PATH: ../../../../
config_options:
defaults:
- callback_whitelist: profile_tasks
+ callbacks_enabled: profile_tasks
timeout: 120
lint:
name: ansible-lint
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
index 21c77f13b..ad2827219 100644
--- a/tests/ansible.cfg
+++ b/tests/ansible.cfg
@@ -10,5 +10,5 @@ fact_caching = jsonfile
fact_caching_connection = /tmp
stdout_callback = skippy
library = ./library:../library
-callback_whitelist = profile_tasks
+callbacks_enabled = profile_tasks
jinja2_extensions = jinja2.ext.do
--
GitLab