From fc44a50f649190209345699efa976eee7808030e Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Wed, 18 Feb 2015 14:46:20 +1100
Subject: [PATCH] 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
---
manifests/site.pp | 1 +
modules/openstack_project/manifests/zuul_prod.pp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/manifests/site.pp b/manifests/site.pp
index 450a263089..935ddd099e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -497,6 +497,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',
diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp
index bbbbacfa33..e9280b415a 100644
--- a/modules/openstack_project/manifests/zuul_prod.pp
+++ b/modules/openstack_project/manifests/zuul_prod.pp
@@ -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':