opendev/system-config
Code Issues Proposed changes

Merge "Also serve zuul status.json via HTTPS"

Browse Source
This commit is contained in:
Jenkins 2015-03-16 12:20:00 +00:00 committed by Gerrit Code Review
commit 23466bd8c0
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

@ -503,6 +503,9 @@ node 'zuul.openstack.org' {
swift_default_container => 'infra-files', swift_default_container => 'infra-files',
swift_default_logserver_prefix => 'http://logs.openstack.org/', swift_default_logserver_prefix => 'http://logs.openstack.org/',
swift_default_expiry => 14400, 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', zuul_url => 'http://zuul.openstack.org/p',
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org', 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_container = '',
$swift_default_logserver_prefix = '', $swift_default_logserver_prefix = '',
$swift_default_expiry = 7200, $swift_default_expiry = 7200,
$proxy_ssl_cert_file_contents = '',
$proxy_ssl_key_file_contents = '',
$proxy_ssl_chain_file_contents = '',
$sysadmins = [], $sysadmins = [],
$statsd_host = '', $statsd_host = '',
$gearman_workers = [], $gearman_workers = [],
@ -60,6 +63,9 @@ class openstack_project::zuul_prod(
swift_default_container => $swift_default_container, swift_default_container => $swift_default_container,
swift_default_logserver_prefix => $swift_default_logserver_prefix, swift_default_logserver_prefix => $swift_default_logserver_prefix,
swift_default_expiry => $swift_default_expiry, 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': class { '::zuul::server':