summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandra McCann <samccann@redhat.com>2021-10-02 10:52:08 -0400
committerGitHub <noreply@github.com>2021-10-02 09:52:08 -0500
commita20323da3ba7a5c45fcb007d7c9bf52f25885236 (patch)
treeb5b7c21069940b3574d423689ab696efc7430baa
parenta22fb928a53e044d34aa8bbd5e2a4e8f4c37f933 (diff)
downloadansible-a20323da3ba7a5c45fcb007d7c9bf52f25885236.tar.gz
config: small typo fix (#74845) (#75864)
(cherry picked from commit 99a983c92ca981f189ce97bec7b566d59300950a) Co-authored-by: Boris Korzun <drtr0jan@yandex.ru>
-rw-r--r--changelogs/fragments/70028-config-small-typo-fix.yml2
-rw-r--r--docs/docsite/rst/plugins/callback.rst2
-rw-r--r--examples/ansible.cfg2
-rw-r--r--lib/ansible/config/base.yml2
4 files changed, 5 insertions, 3 deletions
diff --git a/changelogs/fragments/70028-config-small-typo-fix.yml b/changelogs/fragments/70028-config-small-typo-fix.yml
new file mode 100644
index 0000000000..5437c7e6e7
--- /dev/null
+++ b/changelogs/fragments/70028-config-small-typo-fix.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - config - use ``callbacks_enabled`` instead ``callback_enabled`` in a deprecated message (https://github.com/ansible/ansible/issues/70028).
diff --git a/docs/docsite/rst/plugins/callback.rst b/docs/docsite/rst/plugins/callback.rst
index bc7263c391..fc26daf324 100644
--- a/docs/docsite/rst/plugins/callback.rst
+++ b/docs/docsite/rst/plugins/callback.rst
@@ -34,7 +34,7 @@ Most callbacks shipped with Ansible are disabled by default and need to be enabl
.. code-block:: ini
- #callback_enabled = timer, mail, profile_roles, collection_namespace.collection_name.custom_callback
+ #callbacks_enabled = timer, mail, profile_roles, collection_namespace.collection_name.custom_callback
Setting a callback plugin for ``ansible-playbook``
--------------------------------------------------
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index d682a9be16..e195363a49 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -84,7 +84,7 @@
# by default.
#
# Enable callback plugins, they can output to stdout but cannot be 'stdout' type.
-#callback_enabled = timer, mail
+#callbacks_enabled = timer, mail
# Determine whether includes in tasks and handlers are "static" by
# default. As of 2.0, includes are dynamic by default. Setting these
diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml
index 9cf3aeede5..896e51790f 100644
--- a/lib/ansible/config/base.yml
+++ b/lib/ansible/config/base.yml
@@ -588,7 +588,7 @@ CALLBACKS_ENABLED:
deprecated:
why: normalizing names to new standard
version: "2.15"
- alternatives: 'callback_enabled'
+ alternatives: 'callbacks_enabled'
- key: callbacks_enabled
section: defaults
version_added: '2.11'