From 4f39642446db91d5ab4db87acba4e26a6ef2d807 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 18 Mar 2019 09:13:11 -0700 Subject: [PATCH] Update zuul ansible location With multi-ansible support, the location of the zuul plugins/modules has moved. Change-Id: I8e2cf1f2276bca5a912fed52062628b3b9d0d6d9 --- test-requirements.txt | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 0d618d0d..167d99c7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ hacking>=0.12.0,<0.13 # Apache-2.0 zuul -ansible<2.4.0 +ansible>=2.5.1,<2.6 ansible-lint<4 bashate>=0.2 zuul-sphinx>=0.2.0 diff --git a/tox.ini b/tox.ini index 085ada0b..31415805 100644 --- a/tox.ini +++ b/tox.ini @@ -27,8 +27,8 @@ passenv = # see openstack-zuul-jobs-linters job for more information. ANSIBLE_ROLES_PATH setenv = - ANSIBLE_LIBRARY= {envsitepackagesdir}/zuul/ansible/library - ANSIBLE_ACTION_PLUGINS = {envsitepackagesdir}/zuul/ansible/actiongeneral + ANSIBLE_LIBRARY= {envsitepackagesdir}/zuul/ansible/base/library + ANSIBLE_ACTION_PLUGINS = {envsitepackagesdir}/zuul/ansible/base/actiongeneral commands = flake8 {posargs} # Ansible lint