zuul/zuul
Code Issues Proposed changes

Merge "Tenant config can be read from an external script"

Browse Source
This commit is contained in:
Zuul
2018-04-10 22:19:51 +00:00
committed by Gerrit Code Review
parent 09ca487406 e63535fe86
commit 4b265969c3
9 changed files with 120 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/admin/components.rst
View File

@@ -251,9 +251,15 @@ The following sections of ``zuul.conf`` are used by the scheduler:
Path to command socket file for the scheduler process.
.. attr:: tenant_config
:required:
Path to :ref:`tenant-config` file.
Path to :ref:`tenant-config` file. This attribute
is exclusive with :attr:`scheduler.tenant_config_script`.
.. attr:: tenant_config_script
Path to a script to execute and load the tenant
config from. This attribute is exclusive with
:attr:`scheduler.tenant_config`.
.. attr:: log_config

5
doc/source/admin/tenants.rst
View File

@@ -21,6 +21,11 @@ YAML file which, like other Zuul configuration files, is a list of
configuration objects, though only one type of object is supported:
``tenant``.
Alternatively the :attr:`scheduler.tenant_config_script`
can be the path to an executable that will be executed and its stdout
used as the tenant configuration. The executable must return a valid
tenant YAML formated output.
Tenant
------