From 1475b15472da6beba3c84433b2231be89668586f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 27 Oct 2017 17:25:10 +0200
Subject: [PATCH] ansible-lint: install zuul

Install zuul so that ansible-lint has zuul integration and will not fail
some tests.

for this, move all requirements directly into tox.ini so that not every
job needs to install them.

Change-Id: I2b16600fad4c18f790e842b200ae21fd90051077
---
 test-requirements.txt | 3 ---
 tox.ini               | 9 +++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index a23b406410..d1f248880a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,3 @@
 hacking>=0.10,<0.11
 bashate>=0.2
 -e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool
-
-ansible<2.4.0
-ansible-lint
diff --git a/tox.ini b/tox.ini
index 449251e039..7904e939a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,16 @@ commands =
 
 [testenv:ansible-linters]
 # TODO(jaegerandi): merge this in linters job once it works fine
+# zuul needs python3
+basepython = python3
+deps = 
+     # Zuul is required to supply the zuul ansible modules for ansible-lint
+     -egit+https://git.openstack.org/openstack-infra/zuul@feature/zuulv3#egg=zuul
+     ansible<2.4.0
+     ansible-lint
 whitelist_externals = bash
+setenv =
+  ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library
 passenv =
   # NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
   # to export ANSIBLE_ROLES_PATH pointing to the currect repos.