From 2163671a7b7d783847e3e7077da0a4371d23c7aa Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 28 Oct 2017 16:51:21 +0200
Subject: [PATCH] Simplify ansible-lint invocation

We have no legacy files in here, so no need to skip them.
Also, sync invocations of ansible lint and ansible syntax checks.

Change-Id: If65edf748b73ff601b3d042b300787284d07e049
---
 tox.ini | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index 7904e939a0..ea1feefcdf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,11 +34,10 @@ passenv =
 commands =
   # Ansible lint
   # [ANSIBLE0012] Commands should not change things if nothing needs doing
-  bash -c "find playbooks -type d -name "legacy" -prune -o \
-    -type f -regex '.*.y[a]ml' -print0 | xargs -t -n1 -0 \
-    ansible-lint -xANSIBLE0012"
+  bash -c "find playbooks -type f -regex '.*.ya?ml' -print0 | \
+    xargs -t -n1 -0 ansible-lint -xANSIBLE0012"
   # Ansible Syntax Check
-  bash -c "cd playbooks; find . -type f -regex '.*.y[a]?ml' -exec \
+  bash -c "find playbooks -type f -regex '.*.ya?ml' -exec \
     ansible-playbook --syntax-check -i {toxinidir}/tests/inventory \{\} + > /dev/null"
 
 [testenv:gerrit]