Merge "Bump ansible for linters"

2018-08-13 16:33:01 +00:00 · 2018-08-13 16:33:01 +00:00 · 754d78a875
parent a0bb9c1013 4b30fa5635
commit 754d78a875
1 changed files with 4 additions and 1 deletions
--- a/tox.ini
+++ b/tox.ini
@ -29,7 +29,10 @@ setenv =
 deps =
     # Zuul is required to supply the zuul ansible modules for ansible-lint
     -egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
-     ansible<2.4.0
+     # Unfortunately pip doesn't do actual dependency resolution, so
+     # we need to manually ansible at the top level to the same as
+     # zuul requirements.txt
+     ansible>=2.5.1,<2.6
     ansible-lint
     hacking>=0.10,<0.11
     bashate>=0.2