diff options
| -rw-r--r-- | .ansible-lint | 3 | ||||
| -rw-r--r-- | .yamllint | 16 | ||||
| -rw-r--r-- | lint-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 5 |
4 files changed, 4 insertions, 22 deletions
diff --git a/.ansible-lint b/.ansible-lint index f9ae078ac..f682b65cf 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -36,3 +36,6 @@ skip_list: - command-instead-of-module - ignore-errors - jinja[spacing] + - yaml[truthy] + - yaml[line-length] + - yaml[octal-values] diff --git a/.yamllint b/.yamllint deleted file mode 100644 index 6e9f06eaa..000000000 --- a/.yamllint +++ /dev/null @@ -1,16 +0,0 @@ ---- -extends: default -ignore: | - .tox/ - -rules: - line-length: disable - truthy: disable - braces: - max-spaces-inside: 1 - comments: - require-starting-space: true - # Ignore comment validation in globals.yml - we break the - # require-starting-space rule. - ignore: | - etc/kolla/globals.yml diff --git a/lint-requirements.txt b/lint-requirements.txt index 64500804f..83c34c89a 100644 --- a/lint-requirements.txt +++ b/lint-requirements.txt @@ -1,5 +1,5 @@ ansible>=10,<12 # GPLv3 -ansible-lint>=6.22.0,<7.0.0 # MIT +ansible-lint<26 # MIT bandit>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 codespell<3 # GPLv2 @@ -108,7 +108,6 @@ commands = {[testenv:bandit]commands} {[testenv:bashate]commands} {[testenv:j2lint]commands} - {[testenv:yamllint]commands} {[testenv:ansible-lint]commands} [testenv:pep8] @@ -160,7 +159,3 @@ deps = {[testenv:linters]deps} commands = python {toxinidir}/tools/validate-all-file.py ansible-lint -p --exclude tests --exclude roles --exclude etc --exclude zuul.d - -[testenv:yamllint] -deps = {[testenv:linters]deps} -commands = yamllint -s . |