Merge pull request #35 from sschneid/allow_delete_fqdn

Allow host FQDN in DELETE
This commit is contained in:
Colin 2014-10-16 15:37:11 -07:00
commit 25c1c3a8d4

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])