vm_shepherd 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b26ee24179e3a6eac7866b2fc7e6eae8c7920d
-  data.tar.gz: cfe1558e6ba8f8e2cb1e4793d792ee83624c3fe0
+  metadata.gz: 48fbe6c2cd34bfaad0e2ce743566fd1b761c2b59
+  data.tar.gz: 50c70c8f1c6c20e1efedb127069ec1b23f5b3702
 SHA512:
-  metadata.gz: 782f788cbf16bb6c4180feab462392da640383a459ebc6114b883f10c6fdf24c879c1f26032ca1537f7754ca0eefe3ba157ee744c126dccea90f4aa64e0b690e
-  data.tar.gz: f0702d87ecd13df5d751093bb4108743fc9795d14ceff393c8ca481b3ba747a7788423f95abd5defc501f52b36e09bfd2aba5c205cfdbdd887f9110c8b498a45
+  metadata.gz: 4b0740a96f985e85dc95d664fac3f9cce049faabb05ac1030ed0034b651d6a8b72b5faad21e0074fba813ef64c25f36c5693257f8b9e4ebdd9f56bec3ef98129
+  data.tar.gz: 168b16079958e28cb5a641c22ae24113332f222d85877fece9ab325b39b6df4a5a3e600dbf6c4f4378aa9f4183ca3cdc55bdc641c91e78a21b2c8e6f2ad9f7f7

data/lib/vm_shepherd/aws_manager.rb

@@ -47,7 +47,13 @@ module VmShepherd
           when ROLLBACK_IN_PROGRESS
             false
           else
-            stack.delete if status == ROLLBACK_COMPLETE
+            if ROLLBACK_COMPLETE == status
+              logger.info("Rolling back stack [#{stack.name}]; events listed below")
+              stack.events.select{|event| event.resource_status_reason}.each do |failed_event|
+                logger.info("#{failed_event.resource_properties} #{failed_event.resource_status_reason}")
+              end
+              stack.delete
+            end
             raise "Unexpected status for stack #{env_config.fetch('stack_name')} : #{status}"
         end
       end

data/lib/vm_shepherd/openstack_manager.rb

@@ -62,7 +62,7 @@ module VmShepherd
       end
 
       image_service.images.each do |image|
-        next unless /#{vm_options[:name]} \d+/ =~ image.name && image.status != 'deleted'
+        next unless /^#{vm_options[:name]} \d+/ =~ image.name && image.status != 'deleted'
         say("Found an Ops Manager image for env [#{vm_options[:name]}]: [#{image.id}][#{image.name}]")
         image.destroy
         say('Ops Manager image destroyed')

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -105,6 +105,8 @@ module VmShepherd
         it 'aborts if stack fails to create' do
           expect(stack).to receive(:status).and_return('CREATE_IN_PROGRESS', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_IN_PROGRESS', 'ROLLBACK_COMPLETE').ordered
           expect(stack).to receive(:delete)
+          expect(stack).to receive(:name).and_return('dummy')
+          expect(stack).to receive(:events).and_return([])
           expect {
             ami_manager.prepare_environment(cloudformation_template_file.path)
           }.to raise_error('Unexpected status for stack aws-stack-name : ROLLBACK_COMPLETE')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1