puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-27 10:28:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b51ba35c18 into 4e2a1fb62c

Browse source
This commit is contained in:
Rick Sherman 2016-07-05 20:11:47 +00:00 • committed by GitHub
commit dc49c09ba0
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vmpooler/api/v1.rb
View file

@ -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)