openstack/bifrost
Code Issues Proposed changes

Merge "Support Ansible 2.10"

Browse Source
This commit is contained in:
Zuul 2020-11-03 16:28:18 +00:00 committed by Gerrit Code Review
commit 547db7485a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/ansible-2.10-ee0211e72f9522c9.yaml Normal file
View File

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

2
scripts/env-setup.sh
View File

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

4
tools/ansible-lint.sh
View File

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

2
tox.ini
View File

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