diff --git a/.zuul.yaml b/.zuul.yaml index 03406f3..117a5c2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -16,9 +16,6 @@ name: ansible-role-zuul-ubuntu-bionic parent: ansible-role-zuul nodeset: ubuntu-bionic - vars: - zuul_pip_version: 3.19.1 - zuul_pip_name: zuul[mysql_reporter] # Testing for zuul_install_method: git - job: @@ -41,10 +38,10 @@ check: jobs: - ansible-role-zuul-ubuntu-bionic - - ansible-role-zuul-src-ubuntu-bionic: - voting: false + - ansible-role-zuul-src-ubuntu-bionic - tox-linters gate: jobs: - ansible-role-zuul-ubuntu-bionic + - ansible-role-zuul-src-ubuntu-bionic - tox-linters diff --git a/templates/etc/zuul/zuul.conf b/templates/etc/zuul/zuul.conf index fd85380..f181b07 100644 --- a/templates/etc/zuul/zuul.conf +++ b/templates/etc/zuul/zuul.conf @@ -7,6 +7,9 @@ server = 127.0.0.1 [zookeeper] hosts = localhost:2181 +tls_ca = /etc/zuul/ssl/zookeeper-cacert.pem +tls_cert = /etc/zuul/ssl/zookeeper-client.pem +tls_key = /etc/zuul/ssl/zookeeper-client.key [gearman_server] listen_address = 127.0.0.1 @@ -42,7 +45,11 @@ zuul_url = 127.0.0.1 [web] log_config = /etc/zuul/web-logging.conf listen_address = 127.0.0.1 +root = http://localhost:9000 [connection database] driver = sql dburi = mysql+pymysql://zuul:secret@127.0.0.1/zuul + +[keystore] +password = MY_SECRET_PASSWORD