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

Rename 'template' and 'count' to 'key' and 'value'

Browse source
This commit is contained in:
Scott Schneider 2014-11-14 13:01:00 -08:00
parent 4c4f637075
commit 7543d6259a
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/vmpooler/api.rb
View file

@ -189,12 +189,12 @@ 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 (template == 'key') if (key == 'key')
result['key'] = count result['key'] = val
end end
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
@ -202,25 +202,25 @@ module Vmpooler
if ( available == 1 ) if ( available == 1 )
result['ok'] = true result['ok'] = true
jdata.each do |template, count| jdata.each do |key, val|
if (template == 'key') if (key == 'key')
next next
end end
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['key'] and $config[:config]['ssh_key'] ) if ( result['key'] and $config[:config]['ssh_key'] )
Net::SCP.upload!( Net::SCP.upload!(
@ -229,14 +229,14 @@ module Vmpooler
) )
end end
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