zergrush_cf 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjJjOWI4MmYzZjUyODVlNjFiYjdmODBjZWI1YTBmZDhkODE2NmNlMQ==
+    NzI3YmEwNzUyYWJkNTVkMGM0Yjg0Zjc1NWQ3ODk1NWFmMWZlNGIxYw==
   data.tar.gz: !binary |-
-    Zjg4NTEyNzhlZWNjN2FiNTNiMmY5NTRjNWUwYThjMTcyOGE3NTM1MA==
+    M2UwYWQyYzg0MGI1MGMzNjllY2I1ODM5NDlkZDlmYzU5NmFhYWI0Mg==
 SHA512:
   metadata.gz: !binary |-
-    MGY1M2VhMDAxNDEyNDczY2U1OGY1MTMwOTY3ZDA4Yzk5NjgwZjMyZjU1NmQ3
-    YTVhZjNlOGQ3MjFhYmE0ZjIzOTAzMWI5MTI0ZDIwNTY3N2FlNGIwYmU3Y2Y2
-    OGIwNmZhZGViMWE0OTAzODhlMzYwNjM3MWIzMGNkZjhjZDZiYzM=
+    M2I2YTFiYzgzNzg5MzE3M2NmM2E3MmMyNDU0NTY1ZjdlYjBlMGM2NzBmOWYx
+    OGQ2NWRkMTIxNWRmNjBhMzE0ZTg5NWU1ZWE5NTI0YTZiNTNhMzk5YTg4MGQ4
+    NWJiYjhlNWQyMmExYjFkN2MwMzE3OTE0MzRkZDJmNDBhNjZiNjY=
   data.tar.gz: !binary |-
-    Njg5Y2ZmOGYzZmRjYjc4ZmEzZTdjYmNkNjI4NDJjM2UzMDBjNzBmZTIzZmUy
-    NDNkMzMxMDM4MWM1ZjYyZjNkOTI4NzlmMTUwMjc4ZTYxYWM1ODI4Mzc4ZGM0
-    ZDlhM2E1MjEwOGRmNTFlYmVmYWZhZThiYzVlNDNhYWFmNmUzNTI=
+    ZmRmOGQyMWIxZmQxYzE0OGY2ZGQzYzhhNWVlMTU1NTk0MGJmMzk2ZWEwMjU2
+    ZjAwMmYzYjBkOWI3ZjUxM2ZiY2ExODhhMmRiNjY5ODcxOWVlNDlmOGVkM2Jh
+    MDdhMWY1MWVkMTQ4YTA4MTg2NDczNzdkNWRlNDY3ZjYzMTNhNzc=

data/lib/zergrush_cf/init.rb

@@ -111,19 +111,24 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
 
 
         # get the event collection and initial info
-        outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
-        while outputs_info == nil do
-            sleep 1 
+        outputs_info = nil
+        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
             outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
+        }
+        while outputs_info == nil do
+            sleep 3
+            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) { 
+                outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
+            }
         end
 
         events = nil
-        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::Errors::Error) {
+        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
             events = cf.describe_stack_events(stack_name).body['StackEvents']
         }
         while events == nil do
             sleep 3
-            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::Errors::Error) {
+            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
                 events = cf.describe_stack_events(stack_name).body['StackEvents']
             }
         end
@@ -134,10 +139,10 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
             event_counter = events.length
 
-            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::Errors::Error) {
+            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
                 events = cf.describe_stack_events(stack_name).body['StackEvents']
+                outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
             }
-            outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
             if outputs_info.body["Stacks"][0]["StackStatus"] == "CREATE_COMPLETE"
                 logEvents(events.first(events.length - event_counter))
                 logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
@@ -203,23 +208,25 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
          # get the event collection and initial info
         outputs_info = nil
         while outputs_info == nil do
-            sleep 1 
-            begin
-                outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
-            rescue Fog::AWS::CloudFormation::NotFound
-                rabbit_objects[:connection].close unless rabbit_objects == nil
-                return 0
-            end
+            sleep 3
+            outputs_info = cf.describe_stacks({ 'StackName' => stack_name }) 
+                begin
+                    outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
+                rescue Fog::AWS::CloudFormation::NotFound
+                    rabbit_objects[:connection].close unless rabbit_objects == nil
+                    return 0
+                end
+            }
         end
 
         events = nil
-        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::Errors::Error) {
+        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
             events = cf.describe_stack_events(stack_name).body['StackEvents']
         }
         while events == nil do
             sleep 3
             begin
-                with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::Errors::Error) {
+                with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
                     events = cf.describe_stack_events(stack_name).body['StackEvents']
                 }
             rescue Fog::AWS::CloudFormation::NotFound
@@ -234,17 +241,17 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
 
             event_counter = events.length
-            begin
-                with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::Errors::Error) {
+            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20) {
+                begin
                     events = cf.describe_stack_events(stack_name).body['StackEvents']
-                }
-                outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
-            rescue Fog::AWS::CloudFormation::NotFound
-                logEvents(events.first(events.length - event_counter))
-                logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
-                rabbit_objects[:connection].close unless rabbit_objects == nil
-                return 0
-            end
+                    outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
+                rescue Fog::AWS::CloudFormation::NotFound
+                    logEvents(events.first(events.length - event_counter))
+                    logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
+                    rabbit_objects[:connection].close unless rabbit_objects == nil
+                    return 0
+                end
+            }
         end
 
         # log remaining events for error case

data/lib/zergrush_cf/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module ZergrushCF
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/zergrush_cf.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "zergrush", ">= 0.0.18"
+  s.add_development_dependency "zergrush", ">= 0.0.19"
 
   s.add_dependency "fog", ">=1.20.0"
   s.add_dependency "bunny", ">=1.2.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zergrush_cf
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - MTN Satellite Communications
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement