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

Merge pull request #41 from sschneid/rename_templatecount_keyvalue

Browse source 
Rename 'template'/'count' to 'key'/'value'
This commit is contained in:
Roger Ignazio 2015-01-12 09:14:23 -08:00
commit 11016fecdc
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/vmpooler/api.rb
View file

@ -189,8 +189,8 @@ module Vmpooler
jdata = JSON.parse(request.body.read) jdata = JSON.parse(request.body.read)
jdata.each do |template, count| jdata.each do |key, val|
if ( $redis.scard('vmpooler__ready__'+template) < count.to_i ) if ( $redis.scard('vmpooler__ready__'+key) < val.to_i )
available = 0 available = 0
end end
end end
@ -198,30 +198,30 @@ module Vmpooler
if ( available == 1 ) if ( available == 1 )
result['ok'] = true result['ok'] = true
jdata.each do |template, count| jdata.each do |key, val|
result[template] ||= {} result[key] ||= {}
result[template]['ok'] = true ## result[key]['ok'] = true ##
count.to_i.times do |i| val.to_i.times do |i|
vm = $redis.spop('vmpooler__ready__'+template) vm = $redis.spop('vmpooler__ready__'+key)
unless (vm.nil?) unless (vm.nil?)
$redis.sadd('vmpooler__running__'+template, vm) $redis.sadd('vmpooler__running__'+key, vm)
$redis.hset('vmpooler__active__'+template, vm, Time.now) $redis.hset('vmpooler__active__'+key, vm, Time.now)
result[template] ||= {} result[key] ||= {}
result[template]['ok'] = true ## result[key]['ok'] = true ##
if ( result[template]['hostname'] ) if ( result[key]['hostname'] )
result[template]['hostname'] = [result[template]['hostname']] if ! result[template]['hostname'].is_a?(Array) result[key]['hostname'] = [result[key]['hostname']] if ! result[key]['hostname'].is_a?(Array)
result[template]['hostname'].push(vm) result[key]['hostname'].push(vm)
else else
result[template]['hostname'] = vm result[key]['hostname'] = vm
end end
else else
result[template]['ok'] = false ## result[key]['ok'] = false ##
result['ok'] = false result['ok'] = false
end end