Fix some zuul config errors.
Update the status URL that is left in gerrit. Don't push zuul refs to gerrit. Don't proxy git requests to zuul in the apache config. Change-Id: I578383d8bcec63b8581dc1a8b50405ad7e7070a5 Reviewed-on: https://review.openstack.org/18195 Approved: James E. Blair <corvus@inaugust.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Tested-by: James E. Blair <corvus@inaugust.com>
This commit is contained in:
parent
539b26343e
commit
2b30f04e8c
modules
@ -30,7 +30,8 @@ class openstack_project::zuul(
|
||||
gerrit_user => $gerrit_user,
|
||||
zuul_ssh_private_key => $zuul_ssh_private_key,
|
||||
url_pattern => $url_pattern,
|
||||
push_change_refs => true
|
||||
push_change_refs => false,
|
||||
status_url => "http://${::fqdn}/",
|
||||
}
|
||||
|
||||
file { '/etc/zuul/layout.yaml':
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
RewriteEngine on
|
||||
RewriteRule /zuul/status http://127.0.0.1:8001/status [P]
|
||||
RewriteCond %{REQUEST_URI} !^/p/
|
||||
RewriteRule / http://127.0.0.1:8001/status [P]
|
||||
|
||||
SetEnv GIT_PROJECT_ROOT /var/lib/zuul/git/
|
||||
|
Loading…
x
Reference in New Issue
Block a user