From 554779c83d0f8dc4c8c4394bc5abe708094bcf68 Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Wed, 18 Feb 2015 14:43:08 +1100
Subject: [PATCH] Configure the default swift log expiry

Allow the swift log instruction timeout to be set.

Change-Id: I73758f04ed8dfb0e5227eac55505c9bc01c540df
---
 manifests/init.pp       | 1 +
 templates/zuul.conf.erb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 04027f2..dab6a02 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -47,6 +47,7 @@ class zuul (
   $swift_region_name = '',
   $swift_default_container = '',
   $swift_default_logserver_prefix = '',
+  $swift_default_expiry = 7200,
 ) {
   include apache
   include pip
diff --git a/templates/zuul.conf.erb b/templates/zuul.conf.erb
index 41dc2ab..a2e6ea4 100644
--- a/templates/zuul.conf.erb
+++ b/templates/zuul.conf.erb
@@ -41,6 +41,7 @@ tenant_name=<%= swift_tenant_name %>
 region_name=<%= swift_region_name %>
 default_container=<%= swift_default_container %>
 default_logserver_prefix=<%= swift_default_logserver_prefix %>
+default_expiry=<%= swift_default_expiry %>
 <% if swift_auth_version != "" -%>
 auth_version=<%= swift_auth_version %>
 <% end -%>