Merge pull request #164 from opscode/adamed-knife-207

KNIFE-207: Also catch Fog::Errors::Error
chef · Oct 31, 2013 · 99398f7 · 99398f7
2 parents 89d0a6e + d821b26
commit 99398f7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/chef/knife/ec2_server_create.rb b/lib/chef/knife/ec2_server_create.rb
@@ -398,7 +398,7 @@ def run
         begin
           create_tags(hashed_tags) unless hashed_tags.empty?
           associate_eip(elastic_ip) if config[:associate_eip]
-        rescue Fog::Compute::AWS::NotFound => e
+        rescue Fog::Compute::AWS::NotFound, Fog::Errors::Error => e
           raise if (tries -= 1) <= 0
           ui.warn("server not ready, retrying tag application (retries left: #{tries})")
           sleep 5