Merge pull request #378 from puppetlabs/fix-merge-issue

(maint) Fix merge issue
This commit is contained in:
Belén 2020-06-04 11:07:51 -07:00 committed by GitHub
commit 621aa07c3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -353,7 +353,7 @@ module Vmpooler
hostname_retries = 0 hostname_retries = 0
max_hostname_retries = 3 max_hostname_retries = 3
while hostname_retries < max_hostname_retries 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'] domain = $config[:config]['domain']
dns_ip, dns_available = check_dns_available(hostname, domain) dns_ip, dns_available = check_dns_available(hostname, domain)
break if hostname_available && dns_available break if hostname_available && dns_available