diff --git a/manifests/init.pp b/manifests/init.pp index e6c5ed4..0e79f38 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/templates/zuul.vhost.erb b/templates/zuul.vhost.erb index 64e82b8..1d01836 100644 --- a/templates/zuul.vhost.erb +++ b/templates/zuul.vhost.erb @@ -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