Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Scott Schneider 2014-10-31 11:53:38 -07:00
commit ddef2e642e

View file

@ -303,6 +303,10 @@ module Vmpooler
result['ok'] = false result['ok'] = false
if ( $config[:config]['domain'] and params[:hostname] =~ /^\w+\.#{$config[:config]['domain']}$/ )
params[:hostname] = params[:hostname][/[^\.]+/]
end
$config[:pools].each do |pool| $config[:pools].each do |pool|
if $redis.sismember('vmpooler__running__'+pool['name'], params[:hostname]) if $redis.sismember('vmpooler__running__'+pool['name'], params[:hostname])
$redis.srem('vmpooler__running__'+pool['name'], params[:hostname]) $redis.srem('vmpooler__running__'+pool['name'], params[:hostname])