Merge "Set the expiry for zuul swift instructions"

This commit is contained in:
Jenkins 2015-02-18 22:42:21 +00:00 committed by Gerrit Code Review
commit 776e790919
2 changed files with 3 additions and 0 deletions

View File

@ -498,6 +498,7 @@ node 'zuul.openstack.org' {
swift_region_name => 'DFW',
swift_default_container => 'infra-files',
swift_default_logserver_prefix => 'http://logs.openstack.org/',
swift_default_expiry => 14400,
zuul_url => 'http://zuul.openstack.org/p',
sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org',

View File

@ -18,6 +18,7 @@ class openstack_project::zuul_prod(
$swift_region_name = '',
$swift_default_container = '',
$swift_default_logserver_prefix = '',
$swift_default_expiry = 7200,
$sysadmins = [],
$statsd_host = '',
$gearman_workers = [],
@ -58,6 +59,7 @@ class openstack_project::zuul_prod(
swift_region_name => $swift_region_name,
swift_default_container => $swift_default_container,
swift_default_logserver_prefix => $swift_default_logserver_prefix,
swift_default_expiry => $swift_default_expiry,
}
class { '::zuul::server':