vm_shepherd 3.1.3 → 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a3aaa9c290909db3947ece583dae59929f83ad80
4
- data.tar.gz: ad25085ed542219e494b2fddae6e7917bf082cca
3
+ metadata.gz: 32cc9f496785d39b7c220ce6b64d8664c7de8768
4
+ data.tar.gz: bcb21b3a0ed017a5141de5d9947ca4f5ceef6577
5
5
  SHA512:
6
- metadata.gz: 76d4eb61f31199d6e2c90953f842da8ee5544b659dd0a85b94e062dc610b9534979d37060afdc1c9eeb2254291f0eea22a9017dcfa5f88094dc9ed92c29eaf9a
7
- data.tar.gz: ae3ef04a0cd2e67965ad8f0a3246155f00f1173a1684756d9ffa1e845416f422bb8e660e6fc9b716a6e4887acc9892b993453db372601f31936cecff763b27b1
6
+ metadata.gz: 7951b966a53745015b015d83e22400e2da8938ec7382bccbec5b00ede38a9d50c1620087e9b20e544e89994038d27111ed86fba795d405fd24ac84ae1074556b
7
+ data.tar.gz: ba1a4a420d41d6d091879a6e2afd91156a8561783bafe868cea2e9f181b9548ac20831a90268433752bdb96e76059aff0a5f4e11e805acc769160d85ff3f0beb
@@ -72,20 +72,22 @@ module VmShepherd
72
72
 
73
73
  def clean_environment
74
74
  say("Destroying #{service.servers.size} instances:")
75
- service.servers.each do |server|
76
- server.volumes.each do |volume|
77
- say(" Detaching volume #{volume.id} from server #{server.id}")
78
- server.detach_volume(volume.id)
75
+ retry_until(retry_limit: 2) do
76
+ service.servers.each do |server|
77
+ server.volumes.each do |volume|
78
+ say(" Detaching volume #{volume.id} from server #{server.id}")
79
+ server.detach_volume(volume.id)
80
+ end
81
+
82
+ say(" Destroying instance #{server.id}")
83
+ server.destroy
79
84
  end
80
85
 
81
- say(" Destroying instance #{server.id}")
82
- server.destroy
83
- end
84
-
85
- retry_until(retry_limit: 30) do
86
- server_count = service.servers.count
87
- say(" Waiting for #{server_count} servers to be destroyed")
88
- server_count == 0
86
+ retry_until(retry_limit: 15) do
87
+ server_count = service.servers.count
88
+ say(" Waiting for #{server_count} servers to be destroyed")
89
+ server_count == 0
90
+ end
89
91
  end
90
92
 
91
93
  private_images = image_service.images.reject(&:is_public)
@@ -1,3 +1,3 @@
1
1
  module VmShepherd
2
- VERSION = '3.1.3'.freeze
2
+ VERSION = '3.1.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vm_shepherd
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.3
4
+ version: 3.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ops Manager Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-04 00:00:00.000000000 Z
11
+ date: 2016-04-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-v1