opendev
/
puppet-zuul
Code Issues Proposed changes

Expose zuul_status_url for zuulv3 

With zuulv3 we have created per tenant status.json files. Expose this
to allow us to properly configure the 'openstack' tenant for the
webui.

Change-Id: I866e4ffa90930a44b4cdac5a48e7034bb0d6398d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-06-08 19:11:58 -04:00
parent 534fa140b2
commit df1913b654
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/init.pp
View File

@ -32,6 +32,7 @@ class zuul (
$tenant_file_name = 'main.yaml',
$url_pattern = '',
$status_url = "https://${::fqdn}/",
$zuul_status_url = 'http://127.0.0.1:8001',
$zuul_url = '',
$git_source_repo = 'https://git.openstack.org/openstack-infra/zuul',
$job_name_in_report = false,

8
templates/zuul.vhost.erb
View File

@ -33,8 +33,8 @@
RewriteCond %{HTTP_REFERER} =<%= referer %>
RewriteRule ^/status.json - [F]
<% end -%>
RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P]
RewriteRule ^/status/(.*) http://127.0.0.1:8001/status/$1 [P]
RewriteRule ^/status.json$ <%= @zuul_status_url %>/status.json [P]
RewriteRule ^/status/(.*) <%= @zuul_status_url %>/status/$1 [P]
AddOutputFilterByType DEFLATE application/json
@ -98,8 +98,8 @@
RewriteCond %{HTTP_REFERER} =<%= referer %>
RewriteRule ^/status.json - [F]
<% end -%>
RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P]
RewriteRule ^/status/(.*) http://127.0.0.1:8001/status/$1 [P]
RewriteRule ^/status.json$ <%= @zuul_status_url %>/status.json [P]
RewriteRule ^/status/(.*) <%= @zuul_status_url %>/status/$1 [P]
AddOutputFilterByType DEFLATE application/json