vm_shepherd 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f86d26b80dc99b056384dcc0aaeb0f4bd70578e
-  data.tar.gz: 9da389b55c929e28cb629fc23a84c5c848aa9003
+  metadata.gz: 0a0849bb2535214c6f36d2587fba1b49539cc10d
+  data.tar.gz: 956cd94e7372420ade106411e5bee1a1b2de11bf
 SHA512:
-  metadata.gz: 2401aa7f8af3e5a35de71fac452db992e263b2c071ea8a112f2c445a372ce07615bea54892feaa6a7f7f2deb625ca9da11def4475bd898c695703b1ba09162fc
-  data.tar.gz: 3b310da5855b10284b4da2b1a3bf5f70315ac8e96b0248b0a03e0bcf0681d7ae0cd0eb189b3470dd9b9d8486bb4f0054257ed99fbdc3409ab030eba72e877bc7
+  metadata.gz: 96bca2b1fa4ee198c50802ea3b14ed10393bea9392ef5b7ad670516404420859c4bfad94ae2bc9c6ebe1dd010b82d3047eb57ceb67404bc49c7794a3791aba40
+  data.tar.gz: 00fd41ab55b1d82db8741245264bd2ccf9b31d1e234d24ad7a615d23f4e37e42574d9bb073076587ab4be70e6c5e7c5e0446a0fed45d987332bad70b07ce440a

data/lib/vm_shepherd/openstack_manager.rb

@@ -15,7 +15,7 @@ module VmShepherd
     def deploy(raw_file_path, vm_options)
       say "Uploading the image #{raw_file_path}"
       image = image_service.images.create(
-        name:             vm_options[:name],
+        name:             "#{vm_options[:name]} #{Time.now}",
         size:             File.size(raw_file_path),
         disk_format:      'raw',
         container_format: 'bare',
@@ -61,9 +61,9 @@ module VmShepherd
         say('Ops Manager instance destroyed')
       end
 
-      image = image_service.images.find { |img| img.name == vm_options[:name] }
-      if image
-        say("Found Ops Manager image #{image.id}")
+      image_service.images.each do |image|
+        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')
       end
@@ -92,6 +92,7 @@ module VmShepherd
 
       say("Destroying #{private_images.size} images:")
       private_images.each do |image|
+        next if image.status == 'deleted'
         say("  Destroying image #{image.id}")
         image.destroy
       end

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.8'.freeze
 end

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -117,7 +117,7 @@ module VmShepherd
 
         openstack_vm_manager.deploy(path, openstack_vm_options)
 
-        uploaded_image = image_service.images.find { |image| image.name == openstack_vm_options[:name] }
+        uploaded_image = image_service.images.find { |image| /#{openstack_vm_options[:name]} \d+/ =~ image.name }
         expect(uploaded_image).to be
         expect(uploaded_image.size).to eq(file_size)
         expect(uploaded_image.disk_format).to eq('raw')
@@ -142,7 +142,7 @@ module VmShepherd
           openstack_vm_manager.deploy(path, openstack_vm_options)
 
           instance_image = image_service.images.get instance.image['id']
-          expect(instance_image.name).to eq(openstack_vm_options[:name])
+          expect(instance_image.name).to match(openstack_vm_options[:name])
         end
 
         it 'assigns the correct key_name to the instance' do
@@ -216,7 +216,7 @@ module VmShepherd
       def destroy_correct_image
         change do
           images.reload
-          images.select { |image| image.name == openstack_vm_options[:name] }.any?
+          images.select { |image| /#{openstack_vm_options[:name]} \d.+/ =~ image.name }.any?
         end.from(true).to(false)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.