summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2017-06-23 20:43:38 +0100
committerJames E. Blair <jeblair@redhat.com>2017-07-05 14:38:53 -0700
commitedc4016b4b568a6198c09499cb120456a3d410e9 (patch)
treecb5dae1f3b26208d93d6a182c0e699d6b14009d8 /etc
parent3984036a9884b086626c6f9a72c43e12262818d7 (diff)
downloadzuul-edc4016b4b568a6198c09499cb120456a3d410e9.tar.gz
Correct sample zuul.conf
And add missing zuul.conf config entries. Change-Id: I776826e7ff1fff2edd6f6d332c20a24af1a4eb58
Diffstat (limited to 'etc')
-rw-r--r--etc/zuul.conf-sample8
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/zuul.conf-sample b/etc/zuul.conf-sample
index 2909ea6df..9d74a3b21 100644
--- a/etc/zuul.conf-sample
+++ b/etc/zuul.conf-sample
@@ -11,12 +11,14 @@ start=true
;ssl_key=/path/to/server.key
[zuul]
-layout_config=/etc/zuul/layout.yaml
+status_url=https://zuul.example.com/status
+zookeeper_hosts=127.0.0.1:2181
+
+[scheduler]
+tenant_config=/etc/zuul/main.yaml
log_config=/etc/zuul/logging.conf
pidfile=/var/run/zuul/zuul.pid
state_dir=/var/lib/zuul
-status_url=https://jenkins.example.com/zuul/status
-zookeeper_hosts=127.0.0.1:2181
[merger]
git_dir=/var/lib/zuul/git