mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
Merge pull request #602 from puppetlabs/fix-dns-class-load-bug
(RE-15692) Do not attempt loading DNS classes if none are defined
This commit is contained in:
commit
3821d19096
1 changed files with 7 additions and 5 deletions
|
|
@ -1447,6 +1447,7 @@ module Vmpooler
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_dns_object(config, logger, metrics, redis_connection_pool, dns_class, dns_name, options)
|
def create_dns_object(config, logger, metrics, redis_connection_pool, dns_class, dns_name, options)
|
||||||
|
if defined?(Vmpooler::PoolManager::Dns)
|
||||||
dns_klass = Vmpooler::PoolManager::Dns
|
dns_klass = Vmpooler::PoolManager::Dns
|
||||||
dns_klass.constants.each do |classname|
|
dns_klass.constants.each do |classname|
|
||||||
next unless classname.to_s.casecmp(dns_class) == 0
|
next unless classname.to_s.casecmp(dns_class) == 0
|
||||||
|
|
@ -1455,6 +1456,7 @@ module Vmpooler
|
||||||
end
|
end
|
||||||
raise("DNS '#{dns_class}' is unknown for pool with dns name '#{dns_name}'") if dns_klass.nil?
|
raise("DNS '#{dns_class}' is unknown for pool with dns name '#{dns_name}'") if dns_klass.nil?
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def check_ondemand_requests(maxloop = 0,
|
def check_ondemand_requests(maxloop = 0,
|
||||||
loop_delay_min = CHECK_LOOP_DELAY_MIN_DEFAULT,
|
loop_delay_min = CHECK_LOOP_DELAY_MIN_DEFAULT,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue