Skip to content

Commit bf14155

Browse files
committed
Fix ansible linters
The ANSIBLE_COLLECTIONS_PATHS has been deprecated in 2.19 and changed to ANSIBLE_COLLECTIONS_PATH Change-Id: I6491a6807b822be780ba9265863548774cfbe70b
1 parent 602b305 commit bf14155

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

doc/source/install/playbooks.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ In order to really get started, you must install dependencies.
122122
With the addition of ansible collections, the ``env-setup.sh`` will install
123123
the collections in the default ansible ``collections_paths`` (according to your
124124
ansible.cfg) or you can specify the location setting
125-
``ANSIBLE_COLLECTIONS_PATHS``:
125+
``ANSIBLE_COLLECTIONS_PATH``:
126126

127127
.. code-block:: bash
128128
129-
$ export ANSIBLE_COLLECTIONS_PATHS=/mydir/collections
129+
$ export ANSIBLE_COLLECTIONS_PATH=/mydir/collections
130130
131131
.. note::
132132

133-
If you are using a virtual environment ANSIBLE_COLLECTIONS_PATHS is
133+
If you are using a virtual environment ANSIBLE_COLLECTIONS_PATH is
134134
automatically set. After Ansible Collections are installed,
135135
a symbolic link to to the installation is created in the bifrost playbook
136136
directory.

scripts/env-setup.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fi
1919
ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-${DEFAULT_PIP_ANSIBLE}}
2020
ANSIBLE_SOURCE_PATH=${ANSIBLE_SOURCE_PATH:-ansible${ANSIBLE_PIP_VERSION}}
2121

22-
BIFROST_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATHS:-}
22+
BIFROST_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATH:-}
2323
PLAYBOOKS_LIBRARY_PATH=$(dirname $0)/../playbooks/library
2424

2525
echo "Installing/upgrading Ansible"
@@ -33,9 +33,9 @@ ${PIP} install "${ANSIBLE_SOURCE_PATH}"
3333

3434
ANSIBLE_GALAXY="${SUDO} ${VENV}/bin/ansible-galaxy"
3535
if [[ -z $BIFROST_COLLECTIONS_PATHS ]]; then
36-
echo "Setting ANSIBLE_COLLECTIONS_PATHS to virtualenv"
37-
export ANSIBLE_COLLECTIONS_PATHS=${VENV}/collections
38-
BIFROST_COLLECTIONS_PATHS=$ANSIBLE_COLLECTIONS_PATHS
36+
echo "Setting ANSIBLE_COLLECTIONS_PATH to virtualenv"
37+
export ANSIBLE_COLLECTIONS_PATH=${VENV}/collections
38+
BIFROST_COLLECTIONS_PATHS=$ANSIBLE_COLLECTIONS_PATH
3939
fi
4040
if [[ -n "$ANSIBLE_COLLECTION_SOURCE_PATH" ]]; then
4141
${SUDO} mkdir -p "$BIFROST_COLLECTIONS_PATHS/ansible_collections/openstack"
@@ -51,10 +51,10 @@ else
5151
fi
5252

5353
# Symlink Collections to the playbook directory. This removes the need of setting
54-
# ANSIBLE_COLLECTIONS_PATHS environment variable
54+
# ANSIBLE_COLLECTIONS_PATH environment variable
5555
if [ ! -e "$(dirname $0)/../playbooks/collections" ]; then
5656
echo "Creating a symbolic link to ansible collections in bifrost playbook directory"
57-
ln -s ${ANSIBLE_COLLECTIONS_PATHS} "$(dirname $0)/../playbooks/collections"
57+
ln -s ${ANSIBLE_COLLECTIONS_PATH} "$(dirname $0)/../playbooks/collections"
5858
fi
5959

6060
if [[ "${BIFROST_HIDE_PROMPT:-false}" != true ]]; then

tools/ansible-lint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rm -f "$DEST/ansible_collections/openstack/cloud"
1616

1717
ln -s "$(realpath $SOURCE)" "$DEST/ansible_collections/openstack/cloud"
1818

19-
export ANSIBLE_COLLECTIONS_PATHS="$(realpath $DEST)"
19+
export ANSIBLE_COLLECTIONS_PATH="$(realpath $DEST)"
2020
export ANSIBLE_LIBRARY="$(dirname $0)/../playbooks/library"
2121
export ANSIBLE_ROLES_PATH="$(dirname $0)/../playbooks/roles"
2222

0 commit comments

Comments
 (0)