From 4b1df6cc05032bfc988bbb81cedb7d3fdbd594e6 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Fri, 28 Aug 2020 04:26:17 +1000 Subject: [PATCH] Remove ANSIBLE_COLLECTIONS_PATHS dep warning (#71094) (#71099) (cherry picked from commit aab9beccf7cee166d42ccafecc298660376ddbf6) --- .../fragments/galaxy_collections_paths-remove-dep.yml | 2 ++ lib/ansible/config/base.yml | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) create mode 100644 changelogs/fragments/galaxy_collections_paths-remove-dep.yml diff --git a/changelogs/fragments/galaxy_collections_paths-remove-dep.yml b/changelogs/fragments/galaxy_collections_paths-remove-dep.yml new file mode 100644 index 00000000000..b8ddb570506 --- /dev/null +++ b/changelogs/fragments/galaxy_collections_paths-remove-dep.yml @@ -0,0 +1,2 @@ +bugfixes: +- ANSIBLE_COLLECTIONS_PATHS - remove deprecation so that users of Ansible 2.9 and 2.10+ can use the same var when specifying a collection path without a warning. diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 789749a626f..1ec2304e2be 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -233,20 +233,12 @@ COLLECTIONS_PATHS: default: ~/.ansible/collections:/usr/share/ansible/collections type: pathspec env: - - name: ANSIBLE_COLLECTIONS_PATHS - deprecated: - why: all PATH-type options are singular PATH - version: "2.14" - alternatives: the "ANSIBLE_COLLECTIONS_PATH" environment variable + - name: ANSIBLE_COLLECTIONS_PATHS # TODO: Deprecate this and ini once PATH has been in a few releases. - name: ANSIBLE_COLLECTIONS_PATH version_added: '2.10' ini: - key: collections_paths section: defaults - deprecated: - why: all path-type options are singular path - version: "2.14" - alternatives: the "collections_path" ini setting - key: collections_path section: defaults version_added: '2.10'