Set the expiry for zuul swift instructions

Update the time from the default 2hrs to 4hrs. Some jobs now take
longer than 2 hours to run and this also allows time for testing
when a node is in hold.

Depends-On: I73758f04ed8dfb0e5227eac55505c9bc01c540df
Change-Id: I9e76ccdd9735e6042744f237ceb9af9b9d570f76
This commit is contained in:
Joshua Hesketh 2015-02-18 14:46:20 +11:00
parent 894b4c822d
commit fc44a50f64
2 changed files with 3 additions and 0 deletions

View File

@ -497,6 +497,7 @@ node 'zuul.openstack.org' {
swift_region_name => 'DFW', swift_region_name => 'DFW',
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,
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',

View File

@ -18,6 +18,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 = 7200,
$sysadmins = [], $sysadmins = [],
$statsd_host = '', $statsd_host = '',
$gearman_workers = [], $gearman_workers = [],
@ -58,6 +59,7 @@ class openstack_project::zuul_prod(
swift_region_name => $swift_region_name, swift_region_name => $swift_region_name,
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,
} }
class { '::zuul::server': class { '::zuul::server':