jackal-cfn 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b78d3ccd602cea31525436ce36d1d2756597387
-  data.tar.gz: 194e2ff8fecd71c1a094f93688344c401189043c
+  metadata.gz: 1f9789fbb8ee01ff50a47c77185056c6e52c8937
+  data.tar.gz: 179c2cc85930686d222e3928f05d6e1ec6408a01
 SHA512:
-  metadata.gz: dd7c9fa1468bd96a857f707dd4801cbe8c360a382ab29bbfd5c648dc751a5a10675efca3f8fb54ce59a3505e584a00122dadbac481260e204f0bf5930e3d0cbd
-  data.tar.gz: 746c33dbc420d76e3310cef987f42dcda3b1ca62fb56bad00b4b9d0b3d7afb77c1f49fb8148fb2bc3fd6a1ef3d20956c8012420f8aa699634097f7e915abb96c
+  metadata.gz: 6f9ea369c29581843ea001e10b38747e3b76e12f1cd3756c38f5c5115615380a9922ddb6201bf99ab384da638e3daae677a433482f90b783923eddb96fc86712
+  data.tar.gz: 93ce81bd66869a378ae651b5fe1ccc6dbce264d52535a9ce66e995834de57722ba8aad980f9b7675786fc3f24a0e433daaa385b24d0325ce4e12e82636e61919

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.8
+* Fix optional instance halt to wait for ami AVAILABLE state
+
 # v0.2.6
 * Fix event re-processing (destination generation)
 

data/lib/jackal-cfn/resource/ami_register.rb

@@ -59,21 +59,13 @@ module Jackal
           case cfn_resource[:request_type].to_sym
           when :create
             generate_ami(cfn_response, parameters)
-            unless(cfn_response['Status'] == 'FAILED')
-              if(parameters[:halt_instance].to_s == 'true')
-                halt_ec2_instance(parameters)
-              end
-            end
             poll_for_available = true
           when :update
             destroy_ami(cfn_response, cfn_resource, parameters)
             unless(cfn_response['Status'] == 'FAILED')
               generate_ami(cfn_response, parameters)
-              if(parameters[:halt_instance].to_s == 'true')
-                halt_ec2_instance(parameters)
-              end
+              poll_for_available = true
             end
-            poll_for_available = true
           when :delete
             destroy_ami(cfn_response, cfn_resource, parameters)
           else
@@ -86,6 +78,10 @@ module Jackal
             if(result != 'available')
               cfn_response['Status'] = 'FAILED'
               cfn_response['Reason'] = "Registered AMI resulted in FAILED state #{cfn_response['Data']['AmiId']}"
+            else
+              if(parameters[:halt_instance].to_s == 'true')
+                halt_ec2_instance(parameters)
+              end
             end
           end
           respond_to_stack(cfn_response, cfn_resource[:response_url])

data/lib/jackal-cfn/version.rb

@@ -1,6 +1,6 @@
 module Jackal
   module Cfn
     # Current version
-    VERSION = Gem::Version.new('0.2.6')
+    VERSION = Gem::Version.new('0.2.8')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal