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 #19 from sschneid/backwards-compatible_json

Browse source 
Revive the per-pool 'ok' JSON response until beaker can be patched
This commit is contained in:
Colin 2014-07-21 11:24:04 -07:00
commit dffed6e9d5
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/vmpooler/api.rb
View file

@ -191,6 +191,8 @@ module Vmpooler
jdata.each do |template, count|
result[template] ||= {}
result[template]['ok'] = true ##
count.to_i.times do |i|
vm = $redis.spop('vmpooler__ready__'+template)
@ -200,6 +202,8 @@ module Vmpooler
result[template] ||= {}
result[template]['ok'] = true ##
if ( result[template]['hostname'] )
result[template]['hostname'] = [result[template]['hostname']] if ! result[template]['hostname'].is_a?(Array)
result[template]['hostname'].push(vm)
@ -207,6 +211,8 @@ module Vmpooler
result[template]['hostname'] = vm
end
else
result[template]['ok'] = false ##
result['ok'] = false
end
end
@ -253,6 +259,8 @@ module Vmpooler
params[:template].split('+').each do |template|
result[template] ||= {}
result[template]['ok'] = true ##
vm = $redis.spop('vmpooler__ready__'+template)
unless (vm.nil?)
@ -268,6 +276,8 @@ module Vmpooler
result[template]['hostname'] = vm
end
else
result[template]['ok'] = false ##
result['ok'] = false
end
end