diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2024-10-29 16:07:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-29 16:07:20 +0100 |
| commit | f29b46e43828d2935e78e988771523b95786b11a (patch) | |
| tree | 1a96e33953c5ec68ddb4fd81e3e8a901d8eef98e | |
| parent | Enable file module to disable diff_mode (#83700) (diff) | |
| download | ansible-f29b46e43828d2935e78e988771523b95786b11a.tar.xz ansible-f29b46e43828d2935e78e988771523b95786b11a.zip | |
Remove deprecated plural form of collection path (#84156)
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
| -rw-r--r-- | changelogs/fragments/config.yml | 3 | ||||
| -rw-r--r-- | lib/ansible/config/base.yml | 9 | ||||
| -rw-r--r-- | test/integration/targets/ansible-galaxy-collection/tasks/install.yml | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/changelogs/fragments/config.yml b/changelogs/fragments/config.yml new file mode 100644 index 0000000000..e7b7d6f808 --- /dev/null +++ b/changelogs/fragments/config.yml @@ -0,0 +1,3 @@ +--- +removed_features: + - Remove deprecated plural form of collection path (https://github.com/ansible/ansible/pull/84156). diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 2613e1812d..141f85caa4 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -212,18 +212,9 @@ COLLECTIONS_PATHS: default: '{{ ANSIBLE_HOME ~ "/collections:/usr/share/ansible/collections" }}' type: pathspec env: - - name: ANSIBLE_COLLECTIONS_PATHS - deprecated: - why: does not fit var naming standard, use the singular form ANSIBLE_COLLECTIONS_PATH instead - version: "2.19" - name: ANSIBLE_COLLECTIONS_PATH version_added: '2.10' ini: - - key: collections_paths - section: defaults - deprecated: - why: does not fit var naming standard, use the singular form collections_path instead - version: "2.19" - key: collections_path section: defaults version_added: '2.10' diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/install.yml b/test/integration/targets/ansible-galaxy-collection/tasks/install.yml index 4cc3985c6a..f6055b660c 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/install.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/install.yml @@ -1155,7 +1155,7 @@ - name: install collection with directory source and trailing slash - {{ test_id }} command: ansible-galaxy collection install '{{ galaxy_dir }}/scratch/trailing_dir/name/' {{ galaxy_verbosity }} environment: - ANSIBLE_COLLECTIONS_PATHS: '{{ galaxy_dir }}/ansible_collections' + ANSIBLE_COLLECTIONS_PATH: '{{ galaxy_dir }}/ansible_collections' register: install_dir_slash - name: get result of install collections with with trailing slash - {{ test_id }} |