From 969a5e623f2167973d1d41af7923d9489e19e7ca Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 30 May 2022 14:10:56 +0200 Subject: [PATCH] Use Ansible 5.x Support most recent version of Ansible up to 5.x as default. Change-Id: Ia2e9c78c56f6d0314471973e71de0b45e3309d71 --- releasenotes/notes/ansible-5.x-c6b4abf349caf632.yaml | 4 ++++ scripts/env-setup.sh | 2 +- tox.ini | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/ansible-5.x-c6b4abf349caf632.yaml diff --git a/releasenotes/notes/ansible-5.x-c6b4abf349caf632.yaml b/releasenotes/notes/ansible-5.x-c6b4abf349caf632.yaml new file mode 100644 index 000000000..9933d8cdd --- /dev/null +++ b/releasenotes/notes/ansible-5.x-c6b4abf349caf632.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Ansible 5.x is now supported and used by default. diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh index 2aa727cfa..dd1da0563 100755 --- a/scripts/env-setup.sh +++ b/scripts/env-setup.sh @@ -6,7 +6,7 @@ set -euo pipefail # NOTE(pas-ha) the above exports some useful variables like # $PYTHON , $PIP and $VENV depending on venv install or not -DEFAULT_PIP_ANSIBLE='>=4,<5' +DEFAULT_PIP_ANSIBLE='>=5,<6' ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml} ANSIBLE_COLLECTION_SOURCE_PATH= diff --git a/tox.ini b/tox.ini index 895963db0..b8700a1de 100644 --- a/tox.ini +++ b/tox.ini @@ -86,7 +86,7 @@ deps = usedevelop = False allowlist_externals = bash deps = - ansible>=4,<5 + ansible>=5,<6 ansible-lint>=5,<6 commands = bash tools/ansible-lint.sh