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

Merge pull request #101 from sschneid/token_metadata_in_vm_obj

Browse source 
Store token metadata in vmpooler__vm__ Redis hash
This commit is contained in:
Colin 2015-05-06 13:33:01 -07:00
commit 640b1ef4da
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,8 +308,15 @@ module Vmpooler
backend.hset('vmpooler__active__' + key, vm, Time.now)
backend.hset('vmpooler__vm__' + vm, 'checkout', Time.now)
if Vmpooler::API.settings.config[:auth] and has_valid_token? and config['vm_lifetime_auth'].to_i > 0
backend.hset('vmpooler__vm__' + vm, 'lifetime', config['vm_lifetime_auth'].to_i)
if Vmpooler::API.settings.config[:auth] and has_valid_token?
backend.hset('vmpooler__vm__' + vm, 'token:token', request.env['HTTP_X_AUTH_TOKEN'])
backend.hset('vmpooler__vm__' + vm, 'token:user',
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)
end
end
result[key] ||= {}