Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Workaround ansible-lint installation failure
Browse files Browse the repository at this point in the history
* Bumps ansible-lint to master vesion (which got fix)
* Resolves bug with vars file placed inside tasks folder which caused
  linter to crash parsing them.
  ansible/ansible-lint#595
* Includes tox.ini fix for HTTP proxies

Partial-Bug: #1848512
Partial-Bug: ansible/ansible-lint#590
Partial-Bug: ansible/ansible-lint#595
Change-Id: Ib505b05ef909d0ded9dd87a67166b8f821d62d14
  • Loading branch information
ssbarnea committed Oct 23, 2019
1 parent f87828c commit 9afdcca
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
---
parseable: true
skip_list:
# One two excuses for adding skips: bugs in linter and recent linter bumping
- ANSIBLE0006
- ANSIBLE0012
- ANSIBLE0016
- '204' # [E204] Lines should be no longer than 120 chars
- '306' # [E306] Shells that use pipes should set the pipefail option
# E602 https://github.com/ansible/ansible-lint/issues/450
- '602' # [E602] Don't compare to empty string
# E405 is too new and we need to enable it in a separate change
- '405' # [E405] Remote package tasks should have a retry
- '701' # [E701] No 'galaxy_info' found
6 changes: 4 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ repos:
files: \.(yaml|yml)$
types: [file, yaml]
entry: yamllint --strict -f parsable
- repo: https://github.com/ansible/ansible-lint
rev: v4.0.1
# Revert to upstream branch fix for bug below is released (tagged)
# https://github.com/ansible/ansible-lint/issues/595
- repo: https://github.com/ansible/ansible-lint.git
rev: 0523c63f193d65313dcd743686d7fb0623a72ee8
hooks:
- id: ansible-lint
files: \.(yaml|yml)$
Expand Down
2 changes: 1 addition & 1 deletion roles/libvirt/teardown/nodes/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

- name: Include vars for libvirt-nodepool
include_vars:
file: "{{ role_path }}/../../setup/overcloud/tasks/vars/libvirt_nodepool_vars.yml"
file: "{{ role_path }}/../../setup/overcloud/vars/libvirt_nodepool_vars.yml"
when: libvirt_nodepool|default(false)

- name: Check if libvirt is available
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ setenv =
PIP_DISABLE_PIP_VERSION_CHECK=1
passenv =
ANSIBLE_*
CURL_CA_BUNDLE
DOCKER_*
MOLECULE_*
REQUESTS_CA_BUNDLE
SSH_AUTH_SOCK
SSL_CERT_FILE
TERM
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals =
Expand Down

0 comments on commit 9afdcca

Please sign in to comment.