opendev/system-config
Code Issues Proposed changes

Also serve zuul status.json via HTTPS

Browse Source 
So that we can include slices of zuul status data via Javascript at
https://review.openstack.org/ we also need it to be served via HTTPS
to match or else browsers will balk at it. Note that this does not
stop serving via HTTP or redirect it in any way, it is merely a
secondary means of obtaining the same data.

Change-Id: I1a11c990ea83e00550a0564ac1cf9d5d883db97d
Depends-On: I9799f39bf170f660bcbc17719937e1e87b68ac4a
This commit is contained in:
Jeremy Stanley 2015-02-12 20:35:00 +00:00 committed by Clark Boylan
parent 7b761f4148
commit cd324bdfac
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -499,6 +499,9 @@ node 'zuul.openstack.org' {
swift_default_container => 'infra-files',
swift_default_logserver_prefix => 'http://logs.openstack.org/',
swift_default_expiry => 14400,
proxy_ssl_cert_file_contents => hiera('zuul_ssl_cert_file_contents', 'XXX'),
proxy_ssl_key_file_contents => hiera('zuul_ssl_key_file_contents', 'XXX'),
proxy_ssl_chain_file_contents => hiera('zuul_ssl_chain_file_contents', 'XXX'),
zuul_url => 'http://zuul.openstack.org/p',
sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org',

6
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -19,6 +19,9 @@ class openstack_project::zuul_prod(
$swift_default_container = '',
$swift_default_logserver_prefix = '',
$swift_default_expiry = 7200,
$proxy_ssl_cert_file_contents = '',
$proxy_ssl_key_file_contents = '',
$proxy_ssl_chain_file_contents = '',
$sysadmins = [],
$statsd_host = '',
$gearman_workers = [],
@ -60,6 +63,9 @@ class openstack_project::zuul_prod(
swift_default_container => $swift_default_container,
swift_default_logserver_prefix => $swift_default_logserver_prefix,
swift_default_expiry => $swift_default_expiry,
proxy_ssl_cert_file_contents => $proxy_ssl_cert_file_contents,
proxy_ssl_key_file_contents => $proxy_ssl_key_file_contents,
proxy_ssl_chain_file_contents => $proxy_ssl_chain_file_contents,
}
class { '::zuul::server':