summaryrefslogtreecommitdiff
path: root/zuul/configloader.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-10-30 09:25:07 +0000
committerGerrit Code Review <review@openstack.org>2021-10-30 09:25:07 +0000
commit46519e2089b9bc0ec88a6c4b19517126a0a36980 (patch)
tree0f34b7a31f04eeb5a9ed9131a148ecb0d47492ab /zuul/configloader.py
parentdb5744a1bbdbaa494d4bad8d05f8c72e99821865 (diff)
parent0cfd75d7ef0048e497ea44b694841c616e70cd6a (diff)
downloadzuul-46519e2089b9bc0ec88a6c4b19517126a0a36980.tar.gz
Merge "Zuul-web: Add authentication-realm attribute to tenants"
Diffstat (limited to 'zuul/configloader.py')
-rw-r--r--zuul/configloader.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/zuul/configloader.py b/zuul/configloader.py
index d0a6965da..6493857cf 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -1510,6 +1510,7 @@ class TenantParser(object):
'default-parent': str,
'default-ansible-version': vs.Any(str, float),
'admin-rules': to_list(str),
+ 'authentication-realm': str,
# TODO: Ignored, allowed for backwards compat, remove for v5.
'report-build-page': bool,
'web-root': str,
@@ -1531,6 +1532,8 @@ class TenantParser(object):
conf['exclude-unprotected-branches']
if conf.get('admin-rules') is not None:
tenant.authorization_rules = conf['admin-rules']
+ if conf.get('authentication-realm') is not None:
+ tenant.default_auth_realm = conf['authentication-realm']
tenant.web_root = conf.get('web-root', self.scheduler.globals.web_root)
if tenant.web_root and not tenant.web_root.endswith('/'):
tenant.web_root += '/'