From 97d5c4010300affad935c97d212976b6e15a4baa Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Fri, 18 Jun 2021 10:01:54 +0100 Subject: [PATCH] Constrain inventory file location Address regression introduced by #1631 where a playbook named `inventory.yml `could wrongly be evaluated as an inventory file. Related: #1631 --- examples/{ => inventory}/inventory.yml | 0 src/ansiblelint/config.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename examples/{ => inventory}/inventory.yml (100%) diff --git a/examples/inventory.yml b/examples/inventory/inventory.yml similarity index 100% rename from examples/inventory.yml rename to examples/inventory/inventory.yml diff --git a/src/ansiblelint/config.py b/src/ansiblelint/config.py index fa0d2c446e..b0c98c4718 100644 --- a/src/ansiblelint/config.py +++ b/src/ansiblelint/config.py @@ -15,7 +15,7 @@ # Do not sort this list, order matters. {"jinja2": "**/*.j2"}, # jinja2 templates are not always parsable as something else {"jinja2": "**/*.j2.*"}, - {"inventory": "**/inventory.yml"}, + {"inventory": "**/inventory/**.yml"}, {"requirements": "**/meta/requirements.yml"}, # v1 only # https://docs.ansible.com/ansible/latest/dev_guide/collections_galaxy_meta.html {"galaxy": "**/galaxy.yml"}, # Galaxy collection meta