opendev/system-config
Code Issues Proposed changes

Add zuul.opendev.org webserver

Browse Source 
This adds a toplevel zuul webserver for all opendev tenants. This
leverages new work in puppet-zuul (the depends on below) to configure
multiple vhosts.

This will enable us to add new zuul tenants without needing to
reconfigure webservers after this top level web server is added.

Change-Id: Idca6ade4e9f939486cc06f30ded40894e35da505
Depends-On: https://review.openstack.org/#/c/633586
This commit is contained in:
Clark Boylan 2019-01-29 09:07:04 -08:00
parent 3f9df89e74
commit a902797fc9
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
manifests/site.pp
View File

@ -913,11 +913,46 @@ node /^zuul\d+\.open.*\.org$/ {
}
class { '::zuul::web':
tenant_name => 'openstack',
vhost_name => 'zuul.openstack.org',
ssl_cert_file_contents => hiera('zuul_ssl_cert_file_contents'),
ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents'),
ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'),
vhosts => {
'zuul.openstack.org' => {
port => 443,
docroot => '/opt/zuul-web/content',
priority => '50',
ssl => true,
template => 'zuul/zuulv3.vhost.erb',
vhost_name => 'zuul.openstack.org',
},
'zuul.opendev.org' => {
port => 443,
docroot => '/opt/zuul-web/content',
priority => '40',
ssl => true,
template => 'zuul/zuulv3.vhost.erb',
vhost_name => 'zuul.opendev.org',
},
},
vhosts_flags => {
'zuul.openstack.org' => {
tenant_name => 'openstack',
ssl => true,
},
'zuul.opendev.org' => {
tenant_name => '',
ssl => true,
},
},
vhosts_ssl => {
'zuul.openstack.org' => {
ssl_cert_file_contents => hiera('zuul_ssl_cert_file_contents'),
ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents'),
ssl_key_file_contents => hiera('zuul_ssl_key_file_contents'),
},
'zuul.opendev.org' => {
ssl_cert_file_contents => hiera('opendev_zuul_ssl_cert_file_contents'),
ssl_chain_file_contents => hiera('opendev_zuul_ssl_chain_file_contents'),
ssl_key_file_contents => hiera('opendev_zuul_ssl_key_file_contents'),
},
},
}
class { '::zuul::fingergw': }