From a4a10fc0629a1b9796257447084497e1707ac2c5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 22 Mar 2019 18:14:19 -0400 Subject: [PATCH] Define zookeeper hosts for zuul configuration Zuul 3.7.0 introduced a breaking configuration change, we now need to define zookeeper hosts by default. Disable 306 for ansible-lint until we can decided best fix. Change-Id: Idd54f1ea75cccbb0dab7978ca4d7778fbc05bf42 Signed-off-by: Paul Belanger --- templates/etc/zuul/zuul.conf | 3 +++ tox.ini | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/etc/zuul/zuul.conf b/templates/etc/zuul/zuul.conf index 4d840a7..bef1b40 100644 --- a/templates/etc/zuul/zuul.conf +++ b/templates/etc/zuul/zuul.conf @@ -5,6 +5,9 @@ port = 4730 server = 127.0.0.1 +[zookeeper] +hosts = localhost:2181 + [gearman_server] listen_address = 127.0.0.1 log_config = /etc/zuul/gearman-logging.conf diff --git a/tox.ini b/tox.ini index 33fa54c..3243c9f 100644 --- a/tox.ini +++ b/tox.ini @@ -31,7 +31,7 @@ commands = flake8 # Ansible Lint Check bash -c "find . -not -path '*/\.*' -type f -regex '.*.y[a]?ml' -print0 | \ - xargs -t -n1 -0 ansible-lint" + xargs -t -n1 -0 ansible-lint -x 306" # Ansible Syntax Check bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \ ansible-playbook --syntax-check -i tests/inventory \