From b51ba35c18641d4b5227ff3ce952643eefd0ed14 Mon Sep 17 00:00:00 2001
From: Rick Sherman <rick@shermdog.com>
Date: Tue, 12 Jan 2016 15:17:07 -0600
Subject: [PATCH] (QENG-3376) Allow lifetime to be set per-pool

At current vm_lifetime and vm_lifetime_auth are configured globally only.  This change allows that value to be set/overridden per pool.
---
 lib/vmpooler/api/v1.rb |  6 +++---
 vmpooler.yaml.example  | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
index a042351..5d38fb9 100644
--- a/lib/vmpooler/api/v1.rb
+++ b/lib/vmpooler/api/v1.rb
@@ -61,8 +61,8 @@ module Vmpooler
             backend.hget('vmpooler__token__' + request.env['HTTP_X_AUTH_TOKEN'], 'user')
           )
 
-          if config['vm_lifetime_auth'].to_i > 0
-            backend.hset('vmpooler__vm__' + vm, 'lifetime', config['vm_lifetime_auth'].to_i)
+          if (pool['vm_lifetime_auth'] || config['vm_lifetime_auth']).to_i > 0
+            backend.hset('vmpooler__vm__' + vm, 'lifetime', (pool['vm_lifetime_auth'] || config['vm_lifetime_auth']).to_i)
           end
         end
 
@@ -429,7 +429,7 @@ module Vmpooler
         result[params[:hostname]] = {}
 
         result[params[:hostname]]['template'] = rdata['template']
-        result[params[:hostname]]['lifetime'] = (rdata['lifetime'] || config['vm_lifetime']).to_i
+        result[params[:hostname]]['lifetime'] = (rdata['lifetime'] || pool['vm_lifetime'] || config['vm_lifetime']).to_i
 
         if rdata['destroy']
           result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
diff --git a/vmpooler.yaml.example b/vmpooler.yaml.example
index 6e1c5d4..497041b 100644
--- a/vmpooler.yaml.example
+++ b/vmpooler.yaml.example
@@ -220,6 +220,14 @@
 #   - ready_ttl
 #     How long (in minutes) to keep VMs in 'ready' queues before destroying.
 #     (optional)
+#
+#   - vm_lifetime
+#     How long (in hours) to keep VMs in 'running' queues before destroying.
+#     (optional; default: '24')
+#
+#   - vm_lifetime_auth
+#     Same as vm_lifetime, but applied if a valid authentication token is
+#     included during the request.
 
 # Example:
 
@@ -240,4 +248,6 @@
     size: 5
     timeout: 15
     ready_ttl: 1440
+    vm_lifetime: 1
+    vm_lifetime_auth: 4