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

Do not create/delete records if using dynamic dns

Browse source
This commit is contained in:
Jake Spain 2023-02-15 09:45:03 -05:00
parent 89a4273760
commit 6f3d853271
No known key found for this signature in database
GPG key ID: BC1C4DA0A085E113
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/vmpooler/pool_manager.rb
View file

@ -114,9 +114,10 @@ module Vmpooler
def remove_nonexistent_vm(vm, pool, redis) def remove_nonexistent_vm(vm, pool, redis)
redis.srem("vmpooler__pending__#{pool}", vm) redis.srem("vmpooler__pending__#{pool}", vm)
dns_plugin = get_dns_plugin_class_for_pool(pool) dns_plugin = get_dns_plugin_class_for_pool(pool)
dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool)
domain = get_dns_plugin_domain_for_pool(pool) domain = get_dns_plugin_domain_for_pool(pool)
fqdn = vm + '.' + domain fqdn = vm + '.' + domain
dns_plugin.delete_record(fqdn) dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns'
$logger.log('d', "[!] [#{pool}] '#{vm}' no longer exists. Removing from pending.") $logger.log('d', "[!] [#{pool}] '#{vm}' no longer exists. Removing from pending.")
end end
@ -459,7 +460,8 @@ module Vmpooler
$metrics.timing("clone.#{pool_name}", finish) $metrics.timing("clone.#{pool_name}", finish)
dns_plugin.create_or_replace_record(new_vmname) dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool_name)
dns_plugin.create_or_replace_record(new_vmname) unless dns_plugin_class_name == 'dynamic-dns'
rescue StandardError rescue StandardError
@redis.with_metrics do |redis| @redis.with_metrics do |redis|
redis.pipelined do |pipeline| redis.pipelined do |pipeline|
@ -509,7 +511,9 @@ module Vmpooler
provider.destroy_vm(pool, vm) provider.destroy_vm(pool, vm)
domain = get_dns_plugin_domain_for_pool(pool) domain = get_dns_plugin_domain_for_pool(pool)
fqdn = vm + '.' + domain fqdn = vm + '.' + domain
dns_plugin.delete_record(fqdn)
dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool)
dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns'
redis.srem("vmpooler__completed__#{pool}", vm) redis.srem("vmpooler__completed__#{pool}", vm)
@ -701,6 +705,15 @@ module Vmpooler
$providers[provider_name] $providers[provider_name]
end end
def get_dns_plugin_class_name_for_pool(pool_name)
pool = $config[:pools].find { |p| p['name'] == pool_name }
return nil unless pool
plugin_name = pool.fetch('dns_plugin')
plugin_class = Vmpooler::Dns.get_dns_plugin_class_by_name(config, plugin_name)
plugin_class
end
def get_dns_plugin_class_for_pool(pool_name) def get_dns_plugin_class_for_pool(pool_name)
pool = $config[:pools].find { |p| p['name'] == pool_name } pool = $config[:pools].find { |p| p['name'] == pool_name }
return nil unless pool return nil unless pool