lib/kitchen/driver/ec2.rb in kitchen-ec2-0.9.4 vs lib/kitchen/driver/ec2.rb in kitchen-ec2-0.9.5

@@ -199,11 +199,10 @@
         state[:server_id] = server.id
         info("EC2 instance <#{state[:server_id]}> created.")
         wait_until_ready(server, state)
 
         info("EC2 instance <#{state[:server_id]}> ready.")
-        state[:hostname] = hostname(server)
         instance.transport.connection(state).wait_until_ready
         create_ec2_json(state)
         debug("ec2:create '#{state[:hostname]}'")
       end
 
@@ -315,27 +314,37 @@
         end
         server.create_tags(:tags => tags)
       end
 
       def wait_until_ready(server, state)
+        wait_with_destroy(server, state, "to become ready") do |aws_instance|
+          hostname = hostname(aws_instance, config[:interface])
+          # We aggressively store the hostname so if the process fails here
+          # we still have it, even if it will change later
+          state[:hostname] = hostname
+          # Euca instances often report ready before they have an IP
+          aws_instance.exists? &&
+            aws_instance.state.name == "running" &&
+            hostname != "0.0.0.0"
+        end
+      end
+
+      def wait_with_destroy(server, state, status_msg, &block)
         wait_log = proc do |attempts|
           c = attempts * config[:retryable_sleep]
           t = config[:retryable_tries] * config[:retryable_sleep]
-          info "Waited #{c}/#{t}s for instance <#{state[:server_id]}> to become ready."
+          info "Waited #{c}/#{t}s for instance <#{state[:server_id]}> #{status_msg}."
         end
         begin
           server.wait_until(
             :max_attempts => config[:retryable_tries],
             :delay => config[:retryable_sleep],
-            :before_attempt => wait_log
-          ) do |s|
-            hostname = hostname(s, config[:interface])
-            # Euca instances often report ready before they have an IP
-            s.exists? && s.state.name == "running" && !hostname.nil? && hostname != "0.0.0.0"
-          end
+            :before_attempt => wait_log,
+            &block
+          )
         rescue ::Aws::Waiters::Errors::WaiterFailed
           error("Ran out of time waiting for the server with id [#{state[:server_id]}]" \
-            " to become ready, attempting to destroy it")
+            " #{status_msg}, attempting to destroy it")
           destroy(state)
           raise
         end
       end