46e48d7b97
The only rest API endpoint that uses sql queries is
/api/tenant/{tenant}/builds. There's no connection in there, which
means it doesn't make sense for that to be attached to a sql connection
(which is currently the case). Moreover, it doesn't make sense for
*every* tenant's endpoint to be attached to the *same* connection.
In other words, the current situation only allows for a single sql
connection system-wide, even if someone is using different connections
per tenant.
Moving the handler for the endpoint into the sql driver means that it
can dispatch the query to the appropriate connection for a given tenant
(since a tenant is always implied by the REST endpoint).
Moreover, the *rest* of the system actually allows multiple connections
within a single tenant, and we should support that here, but I don't
immediately have a solution of how to handle pagination across queries
that span multiple connections. This is an improvement in that it is
now tenant-scoped, but it's not ideal.
This also removes the (undocumented!) sql_connection_name config file
option.
It also uses the tenant name from the path to constructe the query so
that it always includes the correct tenant (this eliminates the
inadvertant ability for one tenant to query another tenant's builds).
The internal API here isn't great, but it will get cleaned up in the
next patch which converts to cherrypy.
Change-Id: Ie1f19f0b392d4c010ef43dc6220ff1c8667f5a4a
68 lines
1.2 KiB
Plaintext
68 lines
1.2 KiB
Plaintext
[gearman]
|
|
server=127.0.0.1
|
|
;port=4730
|
|
;ssl_ca=/path/to/ca.pem
|
|
;ssl_cert=/path/to/client.pem
|
|
;ssl_key=/path/to/client.key
|
|
|
|
[statsd]
|
|
server=127.0.0.1
|
|
|
|
[zookeeper]
|
|
hosts=127.0.0.1:2181
|
|
|
|
[gearman_server]
|
|
start=true
|
|
;ssl_ca=/path/to/ca.pem
|
|
;ssl_cert=/path/to/server.pem
|
|
;ssl_key=/path/to/server.key
|
|
;port=4730
|
|
|
|
[scheduler]
|
|
tenant_config=/etc/zuul/main.yaml
|
|
log_config=/etc/zuul/logging.conf
|
|
pidfile=/var/run/zuul/zuul.pid
|
|
state_dir=/var/lib/zuul
|
|
|
|
[merger]
|
|
git_dir=/var/lib/zuul/git
|
|
;git_user_email=zuul@example.com
|
|
;git_user_name=zuul
|
|
|
|
[executor]
|
|
default_username=zuul
|
|
trusted_ro_paths=/opt/zuul-scripts:/var/cache
|
|
trusted_rw_paths=/opt/zuul-logs
|
|
|
|
[web]
|
|
listen_address=127.0.0.1
|
|
port=9000
|
|
static_cache_expiry=0
|
|
status_url=https://zuul.example.com/status
|
|
|
|
[connection gerrit]
|
|
driver=gerrit
|
|
server=review.example.com
|
|
;baseurl=https://review.example.com/r
|
|
user=jenkins
|
|
sshkey=/home/jenkins/.ssh/id_rsa
|
|
;keepalive=60
|
|
|
|
[connection smtp]
|
|
driver=smtp
|
|
server=localhost
|
|
port=25
|
|
default_from=zuul@example.com
|
|
default_to=you@example.com
|
|
|
|
[connection mqtt]
|
|
driver=mqtt
|
|
server=localhost
|
|
user=zuul
|
|
password=zuul
|
|
;keepalive=60
|
|
|
|
[connection mydatabase]
|
|
driver=sql
|
|
dburi=mysql+pymysql://user@localhost/zuul
|