From 61c71d6e4e9b3f36edc2fac02dec84242e82aafc Mon Sep 17 00:00:00 2001 From: Samuel Beaulieu Date: Fri, 22 Jul 2022 15:47:13 -0500 Subject: [PATCH] fix vm_ready to check only the provider domain key, which will be used in the future for cloud dns --- lib/vmpooler/providers/ec2.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/vmpooler/providers/ec2.rb b/lib/vmpooler/providers/ec2.rb index ff64335..d38c3c7 100644 --- a/lib/vmpooler/providers/ec2.rb +++ b/lib/vmpooler/providers/ec2.rb @@ -389,12 +389,11 @@ module Vmpooler def vm_ready?(pool_name, vm_name) begin # TODO: we could use a healthcheck resource attached to instance - domain_set = domain || global_config[:config]['domain'] + domain_set = domain if domain_set.nil? vm_ip = get_vm(pool_name, vm_name)['private_dns_name'] vm_name = vm_ip unless vm_ip.nil? end - @logger.log('s', "[>] [#{pool_name}] '#{vm_name}' vm_ready? #{domain_set} #{vm_ip}") open_socket(vm_name, domain_set) rescue StandardError => e @logger.log('s', "[!] [#{pool_name}] '#{vm_name}' instance cannot be reached by vmpooler on tcp port 22; #{e}")