diff --git a/releasenotes/notes/ansible-2.10-ee0211e72f9522c9.yaml b/releasenotes/notes/ansible-2.10-ee0211e72f9522c9.yaml new file mode 100644 index 000000000..a7239259a --- /dev/null +++ b/releasenotes/notes/ansible-2.10-ee0211e72f9522c9.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Ansible 2.10 is now supported and used by default (2.9 is still supported). diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh index 1c0909d1f..c44929677 100755 --- a/scripts/env-setup.sh +++ b/scripts/env-setup.sh @@ -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= diff --git a/tools/ansible-lint.sh b/tools/ansible-lint.sh index 81d8b479c..bd97ab34a 100644 --- a/tools/ansible-lint.sh +++ b/tools/ansible-lint.sh @@ -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 | \ diff --git a/tox.ini b/tox.ini index 4b24483d0..30c4c00a0 100644 --- a/tox.ini +++ b/tox.ini @@ -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