diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index c11b2cc..e333afd 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -24,6 +24,10 @@ module Vmpooler Vmpooler::API.settings.config[:config] end + def full_config + Vmpooler::API.settings.config + end + def pools Vmpooler::API.settings.config[:pools] end @@ -1734,6 +1738,20 @@ module Vmpooler end JSON.pretty_generate(result) end + + get "#{api_prefix}/full_config/?" do + content_type :json + + result = { + full_config: full_config, + status: { + ok: true + } + } + + status 200 + JSON.pretty_generate(result) + end end end end diff --git a/lib/vmpooler/api/v2.rb b/lib/vmpooler/api/v2.rb index 57f75ff..b39722d 100644 --- a/lib/vmpooler/api/v2.rb +++ b/lib/vmpooler/api/v2.rb @@ -71,7 +71,7 @@ module Vmpooler template_backends.each do |template_backend| vms = backend.smembers("vmpooler__ready__#{template_backend}") next if vms.empty? - + vm = vms.pop smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm) if smoved diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 875596b..dc94ee7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,9 +1,7 @@ require 'simplecov' -=begin SimpleCov.start do add_filter '/spec/' end -=end require 'helpers' require 'rspec' require 'vmpooler'