vm_shepherd 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cb12776aa93faaae835823d613748e44659bacf
-  data.tar.gz: 8c1ea6a223a2bfd526c7cbd9c271bff1a2e8623a
+  metadata.gz: b77d6188d98b7db80cb5aa09a5d93badbb463c02
+  data.tar.gz: a7a559e2ee41523aaa0940ef7de1dd1ea335f284
 SHA512:
-  metadata.gz: 725225e34902087f74f08f683cd4e7e1540287eb3b7f2c82f5ed4f2274c5391208003a1f73a3e386b5ad6d162524002d6b43adf263c073a52b0913959205f5b0
-  data.tar.gz: 5b0e55b30b1a643e2769d870f8e78ffd0695264fad8d287f265a26161490b975409aa1035aa1d0da8f24c49b9e7679efb67657ef3e33518a9ec85d348ba80f28
+  metadata.gz: 460698cd40f95471ebe8ff072ff6b0d5f570c831b223e20ff121c4f9f2afcb5afd1523bd336dce1cbb667d05b40b7658ac52a40674794c85d74c0c7923dd65b0
+  data.tar.gz: 7432d12977fbd3017af4610311b1ed2a9f186f5b650bb7194df633fb0557bd8e87bc85d448f6022bf0641eaec0fad9a8eaaee025aed6138098524be49e83ca22

data/lib/vm_shepherd/aws_manager.rb

@@ -187,7 +187,7 @@ module VmShepherd
         logger.info("deleting elb: #{elb.name}")
         elb.delete
         logger.info('waiting until elb is deleted')
-        retry_until(retry_limit: 30) do
+        retry_until(retry_limit: 30, retry_interval: 30) do
           !elb.exists? && !net_interfaces.map(&:exists?).any?
         end
         logger.info("deleting elb security group: #{sg.id}")
@@ -239,7 +239,7 @@ module VmShepherd
       logger.info('deleting CloudFormation stack')
       stack.delete
       logger.info("waiting until status: #{DELETE_COMPLETE}")
-      retry_until(retry_limit: 30, retry_interval: 300) do
+      retry_until(retry_limit: 60, retry_interval: 30) do
         begin
           status = stack.status
           logger.info("current stack status: #{status}")

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.12.3'.freeze
+  VERSION = '1.12.4'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -71,7 +71,7 @@ module VmShepherd
       end
 
       describe 'cloudformation' do
-        it 'polls the status every 300 seconds' do
+        it 'polls the status every 30 seconds' do
           expect(ami_manager).to receive(:retry_until).with(retry_limit: 60, retry_interval: 30)
 
           ami_manager.prepare_environment(cloudformation_template_file.path)
@@ -372,8 +372,8 @@ module VmShepherd
         ami_manager.clean_environment
       end
 
-      it 'polls the status every 300 seconds' do
-        expect(ami_manager).to receive(:retry_until).with(retry_limit: 30, retry_interval: 300)
+      it 'polls the status every 30' do
+        expect(ami_manager).to receive(:retry_until).with(retry_limit: 60, retry_interval: 30)
 
         ami_manager.clean_environment
       end
@@ -390,9 +390,9 @@ module VmShepherd
         ami_manager.clean_environment
       end
 
-      it 'stops retrying after 30 times' do
+      it 'stops retrying after 60 times' do
         expect(stack).to receive(:status).and_return('DELETE_IN_PROGRESS').
-            exactly(30).times
+            exactly(60).times
 
         expect { ami_manager.clean_environment }.to raise_error(AwsManager::RetryLimitExceeded)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Ops Manager Team