openstack/openstack-ansible
Code Issues Proposed changes

Bump ansible-core to 2.15.3 and ansible-lint

Browse Source 
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_cinder/+/895688
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_glance/+/895682
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-openstack_hosts/+/895681
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_nova/+/895689

Change-Id: I38f91c716cfdb82eaec20ab3c7de6fcda363a11d
This commit is contained in:
Dmitriy Rabotyagov 2023-08-22 17:51:19 +02:00 committed by Dmitriy Rabotyagov
parent 1697be9ba8
commit 4130be36d0
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.ansible-lint
View File

@ -1,9 +1,20 @@
---
skip_list: skip_list:
- metadata - fqcn
- yaml[truthy]
- key-order[task]
- run-once[task]
- var-naming[no-role-prefix]
warn_list: warn_list:
- risky-file-permissions
- risky-shell-pipe - risky-shell-pipe
- unnamed-task
- no-handler - no-handler
- var-naming
extra_vars:
nova_hosts: nova_all
nova_serial: 100%
neutron_hosts: neutron_all
neutron_serial: 100%
cinder_hosts: cinder_all
cinder_serial: 100%
service_group: haproxy_all

2
scripts/bootstrap-ansible.sh
View File

@ -22,7 +22,7 @@ set -e -u -x
export HTTP_PROXY=${HTTP_PROXY:-""} export HTTP_PROXY=${HTTP_PROXY:-""}
export HTTPS_PROXY=${HTTPS_PROXY:-""} export HTTPS_PROXY=${HTTPS_PROXY:-""}
# The Ansible version used for testing # The Ansible version used for testing
export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.13.8"} export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.15.3"}
export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"} export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"}
export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"} export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"}
export USER_ROLE_FILE=${USER_ROLE_FILE:-"user-role-requirements.yml"} export USER_ROLE_FILE=${USER_ROLE_FILE:-"user-role-requirements.yml"}

4
scripts/gate-check-commit.sh
View File

@ -137,9 +137,6 @@ elif [[ "${ACTION}" == "linters" ]]; then
# defining working directories # defining working directories
VENV_BIN_DIR=$(dirname ${PIP_COMMAND}) VENV_BIN_DIR=$(dirname ${PIP_COMMAND})
# Due to ansible-lint bug, it can't run from venv without sourcing it
# https://github.com/ansible-community/ansible-lint/issues/1507
source ${VENV_BIN_DIR}/activate
source /usr/local/bin/openstack-ansible.rc source /usr/local/bin/openstack-ansible.rc
# Check if we have test playbook and running checks # Check if we have test playbook and running checks
if [[ -f "/etc/ansible/roles/${SCENARIO}/examples/playbook.yml" ]]; then if [[ -f "/etc/ansible/roles/${SCENARIO}/examples/playbook.yml" ]]; then
@ -170,7 +167,6 @@ elif [[ "${ACTION}" == "linters" ]]; then
--exclude-dir doc \ --exclude-dir doc \
"${ROLE_DIR}" | xargs -r ${VENV_BIN_DIR}/flake8 --verbose "${ROLE_DIR}" | xargs -r ${VENV_BIN_DIR}/flake8 --verbose
deactivate
popd popd
else else
pushd "${OSA_CLONE_DIR}/playbooks" pushd "${OSA_CLONE_DIR}/playbooks"

2
test-requirements.txt
View File

@ -11,6 +11,6 @@ virtualenv>=14.0.6 # MIT
# once we stop doing linters check for the integrated repo with # once we stop doing linters check for the integrated repo with
# openstack-ansible-tests/test-ansible-lint.sh # openstack-ansible-tests/test-ansible-lint.sh
flake8==3.8.3 # MIT flake8==3.8.3 # MIT
ansible-lint==5.3.2 # MIT ansible-lint==6.19.0 # MIT
netaddr>=0.7.18 # BSD netaddr>=0.7.18 # BSD
Jinja2>=2.10 # BSD Jinja2>=2.10 # BSD