From 30b96536b3c2d8b19cfdb7ef00d331fa4fbf6132 Mon Sep 17 00:00:00 2001 From: Samuel Beaulieu Date: Thu, 4 Jun 2020 12:55:30 -0500 Subject: [PATCH] (maint) Fix merge issue It seems like generate_and_check_hostname does not need a method argument this was fixed in one PR, and another change made in another PR and was used inconsistently --- lib/vmpooler/pool_manager.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 0bd2511d6..b694e5b58 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -353,7 +353,7 @@ def find_unique_hostname(pool_name) hostname_retries = 0 max_hostname_retries = 3 while hostname_retries < max_hostname_retries - hostname, hostname_available = generate_and_check_hostname(pool_name) + hostname, hostname_available = generate_and_check_hostname domain = $config[:config]['domain'] dns_ip, dns_available = check_dns_available(hostname, domain) break if hostname_available && dns_available