From 6ca149ebcb68941703c4347ff3f8a7de5115af0e Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 22 Sep 2020 10:37:29 +0100 Subject: [PATCH] Handle deprecation of ANSIBLE_COLLECTIONS_PATHS This has now become ANSIBLE_COLLECTIONS_PATH so we should support both for the period we want to transition from ansible 2.9 to 2.10. See https://github.com/ansible-community/molecule/issues/2756 Change-Id: I5ab53f6d79d1afb6882f5e48b6d594baa85554b9 --- scripts/openstack-ansible.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/openstack-ansible.rc b/scripts/openstack-ansible.rc index 68710d67e9..7bde8513b4 100644 --- a/scripts/openstack-ansible.rc +++ b/scripts/openstack-ansible.rc @@ -24,6 +24,7 @@ mkdir -p "$(dirname ${ANSIBLE_LOG_PATH})" || unset ANSIBLE_LOG_PATH export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK_PATH/roles:/etc/ansible/roles/ceph-ansible/roles}" export ANSIBLE_COLLECTIONS_PATHS="${ANSIBLE_COLLECTIONS_PATHS:-/etc/ansible}" +export ANSIBLE_COLLECTIONS_PATH="${ANSIBLE_COLLECTIONS_PATH:-/etc/ansible}" export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-/etc/ansible/roles/config_template/library:/etc/ansible/roles/plugins/library:/etc/ansible/roles/ceph-ansible/library}" export ANSIBLE_LOOKUP_PLUGINS="${ANSIBLE_LOOKUP_PLUGINS:-/etc/ansible/roles/plugins/lookup}"