vm_shepherd 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3aaa9c290909db3947ece583dae59929f83ad80
-  data.tar.gz: ad25085ed542219e494b2fddae6e7917bf082cca
+  metadata.gz: 32cc9f496785d39b7c220ce6b64d8664c7de8768
+  data.tar.gz: bcb21b3a0ed017a5141de5d9947ca4f5ceef6577
 SHA512:
-  metadata.gz: 76d4eb61f31199d6e2c90953f842da8ee5544b659dd0a85b94e062dc610b9534979d37060afdc1c9eeb2254291f0eea22a9017dcfa5f88094dc9ed92c29eaf9a
-  data.tar.gz: ae3ef04a0cd2e67965ad8f0a3246155f00f1173a1684756d9ffa1e845416f422bb8e660e6fc9b716a6e4887acc9892b993453db372601f31936cecff763b27b1
+  metadata.gz: 7951b966a53745015b015d83e22400e2da8938ec7382bccbec5b00ede38a9d50c1620087e9b20e544e89994038d27111ed86fba795d405fd24ac84ae1074556b
+  data.tar.gz: ba1a4a420d41d6d091879a6e2afd91156a8561783bafe868cea2e9f181b9548ac20831a90268433752bdb96e76059aff0a5f4e11e805acc769160d85ff3f0beb

data/lib/vm_shepherd/openstack_manager.rb

@@ -72,20 +72,22 @@ module VmShepherd
 
     def clean_environment
       say("Destroying #{service.servers.size} instances:")
-      service.servers.each do |server|
-        server.volumes.each do |volume|
-          say("  Detaching volume #{volume.id} from server #{server.id}")
-          server.detach_volume(volume.id)
+      retry_until(retry_limit: 2) do
+        service.servers.each do |server|
+          server.volumes.each do |volume|
+            say("  Detaching volume #{volume.id} from server #{server.id}")
+            server.detach_volume(volume.id)
+          end
+
+          say("  Destroying instance #{server.id}")
+          server.destroy
         end
 
-        say("  Destroying instance #{server.id}")
-        server.destroy
-      end
-
-      retry_until(retry_limit: 30) do
-        server_count = service.servers.count
-        say("  Waiting for #{server_count} servers to be destroyed")
-        server_count == 0
+        retry_until(retry_limit: 15) do
+          server_count = service.servers.count
+          say("  Waiting for #{server_count} servers to be destroyed")
+          server_count == 0
+        end
       end
 
       private_images = image_service.images.reject(&:is_public)

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.1.3'.freeze
+  VERSION = '3.1.4'.freeze
 end

metadata

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