Move zookeeper_hosts to zookeeper section
To anticipate future use of zookeeper by more than just the scheduler, create a new 'zookeeper' section in zuul.conf similar to the 'gearman' section. The 'hosts' entry is the only setting there now, but others may be added later. Change-Id: Ib0bb2dfdc96fa0eb4aad2b4700de2f2004ea15f2
This commit is contained in:
parent
d1de946403
commit
fdb111d7a5
|
@ -51,6 +51,13 @@ Client connection information for gearman.
|
||||||
**ssl_key**
|
**ssl_key**
|
||||||
Optional: An openssl file containing the client private key in PEM format.
|
Optional: An openssl file containing the client private key in PEM format.
|
||||||
|
|
||||||
|
zookeeper
|
||||||
|
"""""""""
|
||||||
|
|
||||||
|
**hosts**
|
||||||
|
A list of zookeeper hosts for Zuul to use when communicating with
|
||||||
|
Nodepool. ``hosts=zk1.example.com,zk2.example.com,zk3.example.com``
|
||||||
|
|
||||||
zuul
|
zuul
|
||||||
""""
|
""""
|
||||||
|
|
||||||
|
@ -59,10 +66,6 @@ zuul
|
||||||
starting jobs for a change. Used by zuul-scheduler only.
|
starting jobs for a change. Used by zuul-scheduler only.
|
||||||
``status_url=https://zuul.example.com/status``
|
``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
|
Scheduler
|
||||||
---------
|
---------
|
||||||
|
|
|
@ -4,6 +4,9 @@ server=127.0.0.1
|
||||||
;ssl_cert=/path/to/client.pem
|
;ssl_cert=/path/to/client.pem
|
||||||
;ssl_key=/path/to/client.key
|
;ssl_key=/path/to/client.key
|
||||||
|
|
||||||
|
[zookeeper]
|
||||||
|
hosts=127.0.0.1:2181
|
||||||
|
|
||||||
[gearman_server]
|
[gearman_server]
|
||||||
start=true
|
start=true
|
||||||
;ssl_ca=/path/to/ca.pem
|
;ssl_ca=/path/to/ca.pem
|
||||||
|
@ -12,7 +15,6 @@ start=true
|
||||||
|
|
||||||
[zuul]
|
[zuul]
|
||||||
status_url=https://zuul.example.com/status
|
status_url=https://zuul.example.com/status
|
||||||
zookeeper_hosts=127.0.0.1:2181
|
|
||||||
|
|
||||||
[scheduler]
|
[scheduler]
|
||||||
tenant_config=/etc/zuul/main.yaml
|
tenant_config=/etc/zuul/main.yaml
|
||||||
|
|
|
@ -150,8 +150,8 @@ class Scheduler(zuul.cmd.ZuulApp):
|
||||||
nodepool = zuul.nodepool.Nodepool(self.sched)
|
nodepool = zuul.nodepool.Nodepool(self.sched)
|
||||||
|
|
||||||
zookeeper = zuul.zk.ZooKeeper()
|
zookeeper = zuul.zk.ZooKeeper()
|
||||||
zookeeper_hosts = get_default(self.config, 'zuul', 'zookeeper_hosts',
|
zookeeper_hosts = get_default(self.config, 'zookeeper',
|
||||||
'127.0.0.1:2181')
|
'hosts', '127.0.0.1:2181')
|
||||||
|
|
||||||
zookeeper.connect(zookeeper_hosts)
|
zookeeper.connect(zookeeper_hosts)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue