From ef7e54e288b543b6121fecd4e6fb3c45d0966aa5 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Mon, 3 Aug 2020 14:22:51 -0700 Subject: [PATCH] Ensure lifetime is set when creating ondemand instances --- lib/vmpooler/pool_manager.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 0d56fbc..2380c36 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -150,8 +150,11 @@ module Vmpooler redis.pipelined do redis.hset("vmpooler__active__#{pool}", vm, Time.now) redis.hset("vmpooler__vm__#{vm}", 'checkout', Time.now) - redis.hset("vmpooler__vm__#{vm}", 'token:token', ondemandrequest_hash['token:token']) if ondemandrequest_hash['token:token'] - redis.hset("vmpooler__vm__#{vm}", 'token:user', ondemandrequest_hash['token:user']) if ondemandrequest_hash['token:user'] + if ondemandrequest_hash['token:token'] + redis.hset("vmpooler__vm__#{vm}", 'token:token', ondemandrequest_hash['token:token']) + redis.hset("vmpooler__vm__#{vm}", 'token:user', ondemandrequest_hash['token:user']) + redis.hset("vmpooler__vm__#{vm}", 'lifetime', $config[:config]['vm_lifetime_auth'].to_i) + end redis.sadd("vmpooler__#{request_id}__#{pool_alias}__#{pool}", vm) end move_vm_queue(pool, vm, 'pending', 'running', redis)