Support Ansible 2.10

No code changes required, but the linters job needed fixing since now
it tries to automagically load the collections in playbooks/collections
and fails with "relative resource paths not supported".

Change-Id: Ifa99a4bccc52f095c057a082fbe3d15a1633de9f
This commit is contained in:
Dmitry Tantsur 2020-10-28 14:07:31 +01:00
parent e211e66a95
commit fd530ac5aa
4 changed files with 8 additions and 4 deletions

View File

@ -0,0 +1,4 @@
---
features:
- |
Ansible 2.10 is now supported and used by default (2.9 is still supported).

View File

@ -5,7 +5,7 @@ set -eu
# NOTE(pas-ha) the above exports some useful variables like
# $PYTHON , $PIP and $VENV depending on venv install or not
DEFAULT_PIP_ANSIBLE='>=2.9,<2.10'
DEFAULT_PIP_ANSIBLE='>=2.9,<2.11'
ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml}
ANSIBLE_COLLECTION_SOURCE_PATH=

View File

@ -2,7 +2,7 @@
set -eu
DEST="$(dirname $0)/../playbooks/collections"
DEST="$(dirname $0)/../.tox/linters/collections"
SOURCE="${ANSIBLE_COLLECTION_SOURCE_PATH:-../ansible-collections-openstack}"
if [ ! -d "$SOURCE" ]; then
@ -16,7 +16,7 @@ rm -f "$DEST/ansible_collections/openstack/cloud"
ln -s "$(realpath $SOURCE)" "$DEST/ansible_collections/openstack/cloud"
export ANSIBLE_COLLECTIONS_PATHS="$DEST"
export ANSIBLE_COLLECTIONS_PATHS="$(realpath $DEST)"
export ANSIBLE_LIBRARY="$(dirname $0)/../playbooks/library"
find playbooks -maxdepth 1 -type f -regex '.*.ya?ml' -print0 | \

View File

@ -74,7 +74,7 @@ deps =
[testenv:linters]
whitelist_externals = bash
deps =
ansible>=2.9.0,<2.10
ansible>=2.10.0,<2.11
ansible-lint>=4.3.0,<5
commands =
bash tools/ansible-lint.sh