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 branch 'master' of github.com:sschneid/vmware-host-pooler

Browse source
This commit is contained in:
Scott Schneider 2014-02-06 09:41:08 -08:00
commit e5b8d882e1
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vmware-host-pooler-api
View file

@ -142,9 +142,6 @@ post '/vm/:template' do
result = {} result = {}
result[params[:template]] = {} result[params[:template]] = {}
if ( ( ! params[:folder] ) or ( ! params[:pool] ))
result[params[:template]]['error'] = 'You must specify a destination \'folder\' and \'pool\''
else
if ( $redis.scard('vmware_host_pool__ready__'+params[:template]) > 0 ) if ( $redis.scard('vmware_host_pool__ready__'+params[:template]) > 0 )
vm = $redis.spop('vmware_host_pool__ready__'+params[:template]) vm = $redis.spop('vmware_host_pool__ready__'+params[:template])
@ -160,7 +157,6 @@ post '/vm/:template' do
else else
result[params[:template]]['ok'] = false result[params[:template]]['ok'] = false
end end
end
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end