beaker 1.17.2 → 1.17.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBjNDZkNTNjYTM2YTcxMDYxNGVkODBlYzk4ZGY3ZjhiZWE0NGI4Yw==
+    NDBiYjkxMWM4Mzg3ODE1ZTI1Njk1YWVjY2JiN2MwMjhhZTU4ZDljOQ==
   data.tar.gz: !binary |-
-    YmU5OTVmYmI5MmU5ODZhZDE3Njg3MWVlOGYyNTM2NTg0ZGMxYzdlNg==
+    YWQwNmUyODFlNDdkZWQ0N2UzZmQ1ZGFiMDY0MDAyMTc2NjcyYTIxZQ==
 SHA512:
   metadata.gz: !binary |-
-    YjFhMDMxMTFmYjFjMDg1ZjIyOTc2NjQ1MDllNGZiYjVkMDM3YTQxZThkMjgw
-    ODk2ODc0MTE4OGE4ZTBlOWUwMTdlZjIyOTNmOTQ2N2FjOTliNTVlNDZlMTU5
-    NzVlZWY3MjBjODhhMzdiNWRmNmM3ZGRiNzIwZTg4ZjU2NWQxZDY=
+    OWNjYjVjYmE3MWUwY2FlODJhOTI0NGVlY2ZkMzBlZDg2ZDEwOWQwYmUzYWVi
+    ODQxYTY1MDU0ODEwYWZkZDIxOTcyNWM3YTVmYzRhNGZjYjJjOWQ2MzUxODk0
+    M2I0N2QzMTc4MWM4MTViZmY4NTc1YTdjMDczMzhmOTM3OTViNDY=
   data.tar.gz: !binary |-
-    NzEzMTg0NzdmZDA3NTI0MjM0OTVhZWRhYWQ0MTgxMGRjMDcyOGRlNDMwODQ0
-    ZjE5MjY2Mjg2OGZjY2VmZmExMTEzNTRmNjkwZDNmYjY0NDUwNTI1NjA1MDBl
-    NGM3MjM4N2ZmMDE3YTY3ZGMyN2I5MWUwMjczZWJiZWU3NGY5MWI=
+    ZWU2MGU5YWMzOGFmZDMwMDdjMDQwMGIxMWQ3NzM2NDFkYzE2OWY5OTc3YjA1
+    MTgxNTI1YjE0NmZiY2I5MTc5MjE2YzRjZTlmODM4ZDRmMTgzNGI0ZTg1ZTU1
+    YzdjNDIyMjI0Mzg0YjFkNzAwMWM1NjMwMjI0YWRjMjcyNjRkY2U=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # beaker - History
 ## Tags
-* [LATEST - 15 Aug, 2014 (f6227484)](#LATEST)
+* [LATEST - 20 Aug, 2014 (92584d1e)](#LATEST)
+* [beaker1.17.2 - 15 Aug, 2014 (c6f1f64a)](#beaker1.17.2)
 * [beaker1.17.1 - 12 Aug, 2014 (72e60299)](#beaker1.17.1)
 * [beaker1.17.0 - 12 Aug, 2014 (fb482b56)](#beaker1.17.0)
 * [beaker1.16.0 - 17 Jul, 2014 (c1267696)](#beaker1.16.0)
@@ -54,7 +55,41 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 15 Aug, 2014 (f6227484)
+### <a name = "LATEST">LATEST - 20 Aug, 2014 (92584d1e)
+
+* (GEM) version bump for 1.17.3 gem (92584d1e)
+
+* Merge pull request #408 from anodelman/ec2 (5c8b14c0)
+
+
+```
+Merge pull request #408 from anodelman/ec2
+
+(MAINT) nits in beaker ec2 support
+```
+* (MAINT) nits in beaker ec2 support (3d823291)
+
+
+```
+(MAINT) nits in beaker ec2 support
+
+- correctly identify zombies that are over X hours old
+- better notification of what instances are being examinged for possible
+  termination
+- properly notify user of missing aws_access_key_id and
+  aws_secret_access_key during initialization
+```
+### <a name = "beaker1.17.2">beaker1.17.2 - 15 Aug, 2014 (c6f1f64a)
+
+* Merge pull request #407 from anodelman/make-gem (c6f1f64a)
+
+
+```
+Merge pull request #407 from anodelman/make-gem
+
+create beaker 1.17.2 gem
+```
+* (HISTORY) update history for 1.17.2 gem (d15db7e4)
 
 * (GEM) update version number for 1.17.2 (f6227484)
 

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -92,15 +92,22 @@ module Beaker
     #@param [Integer] max_age The age in hours that a machine needs to be older than to be considered a zombie
     #@param [String] key The key_name to match for
     def kill_zombies(max_age = ZOMBIE, key = key_name)
-      @logger.notify("aws-sdk: Kill Zombies!")
+      @logger.notify("aws-sdk: Kill Zombies! (keyname: #{key}, age: #{max_age} hrs)")
       #examine all available regions
+      kill_count = 0
+      volume_count = 0
+      time_now = Time.now.getgm #ec2 uses GM time
       @ec2.regions.each do |region|
         @logger.debug "Reviewing: #{region.name}"
         @ec2.regions[region.name].instances.each do |instance|
-          if (instance.key_name =~ /#{key}/) and (instance.launch_time + (ZOMBIE*60*60)) < Time.now and instance.status.to_s !~ /terminated/
+          if (instance.key_name =~ /#{key}/)
+            @logger.debug "Examining #{instance.id} (keyname: #{key}, launch time: #{instance.launch_time}, status: #{instance.status})"
+          end
+          if (instance.key_name =~ /#{key}/) and ((time_now - instance.launch_time) >  ZOMBIE*60*60) and instance.status.to_s !~ /terminated/
             @logger.debug "Kill! #{instance.id}: #{instance.key_name} (Current status: #{instance.status})"
             begin
               instance.terminate()
+              kill_count += 1
             rescue AWS::EC2::Errors => e
               @logger.debug "Failed to remove instance: #{instance.id}, #{e}"
             end
@@ -116,12 +123,14 @@ module Beaker
             if ( vol.status.to_s =~ /available/ )
               @logger.debug "Tear down available volume: #{vol.id}"
               vol.delete()
+              volume_count += 1
             end
           rescue AWS::EC2::Errors::InvalidVolume::NotFound => e
             @logger.debug "Failed to remove volume: #{vol.id}, #{e}"
           end
         end
       end
+      @logger.notify "#{key}: Killed #{kill_count} instance(s), freed #{volume_count} volume(s)"
 
     end
 
@@ -451,6 +460,9 @@ module Beaker
       creds = {}
       creds[:access_key] = default[:aws_access_key_id]
       creds[:secret_key] = default[:aws_secret_access_key]
+      raise "You must specify an aws_access_key_id in your .fog file (#{dot_fog}) for ec2 instances!" unless creds[:access_key]
+      raise "You must specify an aws_secret_access_key in your .fog file (#{dot_fog}) for ec2 instances!" unless creds[:secret_key]
+
       creds
     end
   end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.17.2'
+    STRING = '1.17.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.17.3
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest