diff options
| -rw-r--r-- | doc/source/admin/components.rst | 12 | ||||
| -rw-r--r-- | etc/zuul.conf-sample | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/doc/source/admin/components.rst b/doc/source/admin/components.rst index c77c0fcc6..4e2e889f0 100644 --- a/doc/source/admin/components.rst +++ b/doc/source/admin/components.rst @@ -51,6 +51,18 @@ Client connection information for gearman. **ssl_key** Optional: An openssl file containing the client private key in PEM format. +zuul +"""" + +**status_url** + URL that will be posted in Zuul comments made to changes when + starting jobs for a change. Used by zuul-scheduler only. + ``status_url=https://zuul.example.com/status`` + +**zookeeper_hosts** + A list of zookeeper hosts for Zuul to use when communicating with + Nodepool. ``zookeeper_hosts=zk1.example.com,zk2.example.com,zk3.example.com`` + Scheduler --------- 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 |