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

refactor dns_zone to be renamed domain to match the global parameter being overwritten

Browse source 
in the upstream vmpooler code, we use the global domain parameter, so naming that parameter
the same in GCE. This parameter can be optionally set in the provider config, and
overwrites the global parameter. It is used to infer the FQDN as .
This commit is contained in:
Samuel Beaulieu 2021-12-31 09:54:46 -06:00
parent b66218dc10
commit 2cb2550aca
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,8 +86,8 @@ module Vmpooler
return provider_config['machine_type'] if provider_config['machine_type']
end
def dns_zone
provider_config['dns_zone']
def domain
provider_config['domain']
end
def dns_zone_resource_name
@ -459,7 +459,7 @@ module Vmpooler
def vm_ready?(_pool_name, vm_name)
begin
# TODO: we could use a healthcheck resource attached to instance
open_socket(vm_name, dns_zone || global_config[:config]['domain'])
open_socket(vm_name, domain || global_config[:config]['domain'])
rescue StandardError => _e
return false
end