vm_shepherd 1.11.8 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1b8a594106445d0a53b8ee6781ac35465eadb2
-  data.tar.gz: 71fa0d8ce5df7067cd5cfae957dbc35ce20878b6
+  metadata.gz: 128595ea5d161fca2968a78cf51497f78f2ec9a5
+  data.tar.gz: d1a7136a462f00640aa928e9aae9a6cd88475212
 SHA512:
-  metadata.gz: 08fa5e38593f20c3d77bee6d27e352e1508e3003b0adfdc6627a531fe447c7fc1e647a20c8e192c08a062eb2591003319fce3ca4969de8b8dc41aa44c8e2ce13
-  data.tar.gz: 18d9f25f8f839d9ca94e91356be67364c167adb05a05faa5d272fbcad7487effedc9b74c92caae6449b4635acc1b0830875c8af0de8c0680e42a3ffc2e506c1c
+  metadata.gz: b723a9e0f0323bbac7f4a50bbfdd021987681c57183ddcb344c11d473997158eb656e86f53c6a41535cbddc766e215d5d5bf7e9396c4516971cef8559477408d
+  data.tar.gz: 695902d740ada2ecb721d7b6ce5b66f7b2faf4be5a71da1cff28d583d3e882cf278e2bc3e8cb0ddb999f8dc960a89b46dd6b43496f123782dae1b2a768da1355

data/lib/vm_shepherd/aws_manager.rb

@@ -34,7 +34,7 @@ module VmShepherd
       stack = cfm.stacks.create(env_config.fetch(:stack_name), template, parameters: env_config.fetch(:parameters), capabilities: ['CAPABILITY_IAM'])
 
       logger.info("Waiting for status: #{CREATE_COMPLETE}")
-      retry_until(retry_limit: 30) do
+      retry_until(retry_limit: 30, retry_interval: 300) do
         status = stack.status
         logger.info("current stack status: #{status}")
         case status
@@ -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) do
+      retry_until(retry_limit: 30, retry_interval: 300) do
         begin
           status = stack.status
           logger.info("current stack status: #{status}")

data/lib/vm_shepherd/retry_helper.rb

@@ -6,7 +6,7 @@ module VmShepherd
     RETRY_LIMIT    = 10
     RETRY_INTERVAL = 60
 
-    def retry_until(retry_limit: RETRY_LIMIT, &block)
+    def retry_until(retry_limit: RETRY_LIMIT, retry_interval: RETRY_INTERVAL, &block)
       tries             = 0
       condition_reached = false
       loop do
@@ -14,7 +14,7 @@ module VmShepherd
         raise(RetryLimitExceeded) if tries > retry_limit
         condition_reached = block.call
         break if condition_reached
-        sleep RETRY_INTERVAL
+        sleep retry_interval
       end
       condition_reached
     end

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.11.8'.freeze
+  VERSION = '1.12.0'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -71,6 +71,12 @@ module VmShepherd
       end
 
       describe 'cloudformation' do
+        it 'polls the status every 300 seconds' do
+          expect(ami_manager).to receive(:retry_until).with(retry_limit: 30, retry_interval: 300)
+
+          ami_manager.prepare_environment(cloudformation_template_file.path)
+        end
+
         it 'creates the stack with the correct parameters' do
           expect(stack_collection).to receive(:create).with(
               'aws-stack-name',
@@ -89,7 +95,7 @@ module VmShepherd
           ami_manager.prepare_environment(cloudformation_template_file.path)
         end
 
-        it 'stops retrying after 360 times' do
+        it 'stops retrying after 30 times' do
           expect(stack).to receive(:status).and_return('CREATE_IN_PROGRESS').
               exactly(30).times
 
@@ -366,6 +372,12 @@ 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)
+
+        ami_manager.clean_environment
+      end
+
       it 'deletes the stack' do
         expect(stack_collection).to receive(:[]).with('aws-stack-name').and_return(stack)
         expect(stack).to receive(:delete)
@@ -378,13 +390,15 @@ module VmShepherd
         ami_manager.clean_environment
       end
 
-      it 'stops retrying after 360 times' do
+      it 'stops retrying after 30 times' do
         expect(stack).to receive(:status).and_return('DELETE_IN_PROGRESS').
             exactly(30).times
 
         expect { ami_manager.clean_environment }.to raise_error(AwsManager::RetryLimitExceeded)
       end
 
+
+
       it 'aborts if stack reports unexpected status' do
         expect(stack).to receive(:status).and_return('DELETE_IN_PROGRESS', 'UNEXPECTED_STATUS').ordered
         expect {

data/vm_shepherd.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk-v1'
-  spec.add_dependency 'fog'
+  spec.add_dependency 'fog', '1.34.0'
 
   spec.add_dependency 'ruby_vcloud_sdk', '0.7.2'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.11.8
+  version: 1.12.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -28,16 +28,16 @@ dependencies:
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.34.0
 - !ruby/object:Gem::Dependency
   name: ruby_vcloud_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.