From fedb3632f21f2b119f4ae5ce61df9f51e2761b06 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Tue, 28 Nov 2017 13:14:04 -0800 Subject: [PATCH] Simplify run_select_hosts --- lib/vmpooler/providers/vsphere.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb index 691ae4b..16cc86f 100644 --- a/lib/vmpooler/providers/vsphere.rb +++ b/lib/vmpooler/providers/vsphere.rb @@ -85,12 +85,14 @@ module Vmpooler raise("cluster for pool #{pool_name} cannot be identified") if cluster.nil? raise("datacenter for pool #{pool_name} cannot be identified") if datacenter.nil? dc = "#{datacenter}_#{cluster}" - if target.key?(dc) and target[dc].key?('checking') + select_target_hosts(target, cluster, datacenter) unless target.key?(dc) + if target[dc].key?('checking') wait_for_host_selection(dc, target, loop_delay, max_age) - elsif target.key?(dc) and target[dc].key?('check_time_finished') - select_target_hosts(target, cluster, datacenter) if now - target[dc]['check_time_finished'] > max_age - else - select_target_hosts(target, cluster, datacenter) + end + if target[dc].key?('check_time_finished') + if now - target[dc]['check_time_finished'] > max_age + select_target_hosts(target, cluster, datacenter) + end end end