From 47f3f4ebe3be2b5a434ffc167bea664048bea6ac Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 24 Sep 2018 14:34:59 -0500 Subject: [PATCH] [stable-2.6] Fix issues with PLUGIN_FILTERS_CFG config handling (#45994) * Ensure that the value of PLUGIN_FILTERS_CFG is treated as type=path, and that we use the standard section of 'defaults' instead of 'default' * deprecate the default section * Don't add version_added for the corrected section (cherry picked from commit 172137c) Co-authored-by: Matt Martz --- changelogs/fragments/plugin-filters-cfg.yaml | 2 ++ lib/ansible/config/base.yml | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 changelogs/fragments/plugin-filters-cfg.yaml diff --git a/changelogs/fragments/plugin-filters-cfg.yaml b/changelogs/fragments/plugin-filters-cfg.yaml new file mode 100644 index 00000000000..a2a5b96d05f --- /dev/null +++ b/changelogs/fragments/plugin-filters-cfg.yaml @@ -0,0 +1,2 @@ +bugfixes: +- PLUGIN_FILTERS_CFG - Ensure that the value is treated as type=path, and that we use the standard section of ``defaults`` instead of ``default`` (https://github.com/ansible/ansible/pull/45994) diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 1929d817148..94f6cf6d873 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -1502,6 +1502,13 @@ PLUGIN_FILTERS_CFG: ini: - key: plugin_filters_cfg section: default + deprecated: + why: Specifying "plugin_filters_cfg" under the "default" section is deprecated + version: "2.12" + alternatives: the "defaults" section instead + - key: plugin_filters_cfg + section: defaults + type: path RETRY_FILES_ENABLED: name: Retry files default: True