ec2.rb in kitchen-ec2-3.8.0

- old
+ new

@@ -471,21 +471,21 @@
 
       def submit_spot
         debug("Creating EC2 Spot Instance..")
         instance_data = instance_generator.ec2_instance_data
 
-        request_duration = config[:spot_wait]
         config_spot_price = config[:spot_price].to_s
         if %w{ondemand on-demand}.include?(config_spot_price)
           spot_price = ""
         else
           spot_price = config_spot_price
         end
         spot_options = {
-          spot_instance_type: "persistent", # Cannot use one-time with valid_until
-          valid_until: Time.now + request_duration,
-          instance_interruption_behavior: "stop",
+          # Must use one-time in order to use instance_interruption_behavior=terminate
+          # spot_instance_type: "one-time", # default
+          # Must use instance_interruption_behavior=terminate in order to use block_duration_minutes
+          # instance_interruption_behavior: "terminate", # default
         }
         if config[:block_duration_minutes]
           spot_options[:block_duration_minutes] = config[:block_duration_minutes]
         end
         unless spot_price == "" # i.e. on-demand
@@ -783,10 +783,12 @@
           ip_permissions: [22, 3389, 5985, 5986].map do |port|
             {
               ip_protocol: "tcp",
               from_port: port,
               to_port: port,
-              ip_ranges: [{ cidr_ip: config[:security_group_cidr_ip] }],
+              ip_ranges: Array(config[:security_group_cidr_ip]).map do |cidr_ip|
+                { cidr_ip: cidr_ip }
+              end,
             }
           end
         )
       end
 