puppetlabs/vmpooler-provider-gce
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler-provider-gce.git synced 2026-01-26 11:28:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace dns zone entry if it already exists

Browse source 
on the rare occasion where adding a dns record and we get teh error it already exists
assume that it is stale and replace it with the new IP
This commit is contained in:
Samuel Beaulieu 2021-12-31 09:35:29 -06:00
parent 0beec3d8e9
commit b66218dc10
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/vmpooler/providers/gce.rb
View file

@ -134,7 +134,7 @@ module Vmpooler
# [String] hostname : Specifies the hostname of the instance. The specified hostname must be RFC1035 compliant. If hostname is not specified, # [String] hostname : Specifies the hostname of the instance. The specified hostname must be RFC1035 compliant. If hostname is not specified,
# the default hostname is [ INSTANCE_NAME].c.[PROJECT_ID].internal when using the global DNS, and # the default hostname is [ INSTANCE_NAME].c.[PROJECT_ID].internal when using the global DNS, and
# [ INSTANCE_NAME].[ZONE].c.[PROJECT_ID].internal when using zonal DNS # [ INSTANCE_NAME].[ZONE].c.[PROJECT_ID].internal when using zonal DNS
# [String] template : This is the name of template exposed by the API. It must _match_ the poolname ??? TODO # [String] template : This is the name of template
# [String] poolname : Name of the pool the VM as per labels # [String] poolname : Name of the pool the VM as per labels
# [Time] boottime : Time when the VM was created/booted # [Time] boottime : Time when the VM was created/booted
# [String] status : One of the following values: PROVISIONING, STAGING, RUNNING, STOPPING, SUSPENDING, SUSPENDED, REPAIRING, and TERMINATED # [String] status : One of the following values: PROVISIONING, STAGING, RUNNING, STOPPING, SUSPENDING, SUSPENDED, REPAIRING, and TERMINATED
@ -198,9 +198,6 @@ module Vmpooler
network_interfaces: [network_interfaces], network_interfaces: [network_interfaces],
labels: { 'vm' => new_vmname, 'pool' => pool_name, project => nil } labels: { 'vm' => new_vmname, 'pool' => pool_name, project => nil }
) )
# TODO: Maybe this will be needed to set the hostname (usually internal DNS name but in our case for some reason its nil)
# given_hostname = "#{new_vmname}.#{dns_zone}"
# client.hostname = given_hostname if given_hostname
debug_logger('trigger insert_instance') debug_logger('trigger insert_instance')
result = connection.insert_instance(project, zone(pool_name), client) result = connection.insert_instance(project, zone(pool_name), client)
@ -559,14 +556,17 @@ module Vmpooler
def dns_setup(created_instance) def dns_setup(created_instance)
zone = dns.zone dns_zone_resource_name if dns_zone_resource_name zone = dns.zone dns_zone_resource_name if dns_zone_resource_name
return unless zone && created_instance return unless zone && created_instance && created_instance['name'] && created_instance['ip']
name = created_instance['name'] name = created_instance['name']
change = zone.add name, 'A', 60, [created_instance['ip']] begin
debug_logger("#{change.id} - #{change.started_at} - #{change.status}") if change change = zone.add name, 'A', 60, [created_instance['ip']]
# TODO: should we catch Google::Cloud::AlreadyExistsError that is thrown when it already exist? debug_logger("#{change.id} - #{change.started_at} - #{change.status}") if change
# and then delete and recreate? rescue AlreadyExistsError => _e
# eg the error is Google::Cloud::AlreadyExistsError: alreadyExists: The resource 'entity.change.additions[0]' named 'instance-8.test.vmpooler.puppet.net. (A)' already exists # DNS setup is done only for new instances, so in the rare case where a DNS record already exists (it is stale) and we replace it.
# the error is Google::Cloud::AlreadyExistsError: alreadyExists: The resource 'entity.change.additions[0]' named 'instance-8.test.vmpooler.net. (A)' already exists
zone.replace(name, 'A', 60, [created_instance['ip']])
end
end end
def dns_teardown(created_instance) def dns_teardown(created_instance)
@ -640,7 +640,7 @@ module Vmpooler
end end
# Return a hash of VM data # Return a hash of VM data
# Provides vmname, hostname, template, poolname, boottime, status, zone, machine_type information # Provides vmname, hostname, template, poolname, boottime, status, zone, machine_type, labels, label_fingerprint, ip information
def generate_vm_hash(vm_object, pool_name) def generate_vm_hash(vm_object, pool_name)
pool_configuration = pool_config(pool_name) pool_configuration = pool_config(pool_name)
return nil if pool_configuration.nil? return nil if pool_configuration.nil?
@ -648,7 +648,7 @@ module Vmpooler
{ {
'name' => vm_object.name, 'name' => vm_object.name,
'hostname' => vm_object.hostname, 'hostname' => vm_object.hostname,
'template' => pool_configuration&.key?('template') ? pool_configuration['template'] : nil, # TODO: get it from the API, not from config, but this is what vSphere does too! 'template' => pool_configuration&.key?('template') ? pool_configuration['template'] : nil, # was expecting to get it from API, not from config, but this is what vSphere does too!
'poolname' => vm_object.labels&.key?('pool') ? vm_object.labels['pool'] : nil, 'poolname' => vm_object.labels&.key?('pool') ? vm_object.labels['pool'] : nil,
'boottime' => vm_object.creation_timestamp, 'boottime' => vm_object.creation_timestamp,
'status' => vm_object.status, # One of the following values: PROVISIONING, STAGING, RUNNING, STOPPING, SUSPENDING, SUSPENDED, REPAIRING, and TERMINATED 'status' => vm_object.status, # One of the following values: PROVISIONING, STAGING, RUNNING, STOPPING, SUSPENDING, SUSPENDED, REPAIRING, and TERMINATED
@ -657,7 +657,6 @@ module Vmpooler
'labels' => vm_object.labels, 'labels' => vm_object.labels,
'label_fingerprint' => vm_object.label_fingerprint, 'label_fingerprint' => vm_object.label_fingerprint,
'ip' => vm_object.network_interfaces ? vm_object.network_interfaces.first.network_ip : nil 'ip' => vm_object.network_interfaces ? vm_object.network_interfaces.first.network_ip : nil
# 'powerstate' => powerstate
} }
end end