bosh-director 1.2751.0 → 1.2754.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/cloudcheck_helper.rb +6 -0
  3. data/lib/bosh/director/version.rb +1 -1
  4. metadata +23 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4f9c865a613b5fddaca72fb5917993829a29e38b
4
- data.tar.gz: 88059825781c7c7ed80c2f292d3706da42af98b3
3
+ metadata.gz: 21ea8f2de886c1f51de48ca0026b1c825d70d7f1
4
+ data.tar.gz: 5c2a90254f9567389f4adfef3cb64f4e4d450f68
5
5
  SHA512:
6
- metadata.gz: 216d91a468be53faf8a624a365eae70d9e2b07eb1fc0eb3e180497a7f84f7f54e524c2a61b37994deaa735b14dbc7acb65399885d00af3950cbd91864dfb0286
7
- data.tar.gz: 491cb190b6f1027c9863d64d6ff2e1ee3cfcd34e6b41ddec44203cc1c2220f1e06647b061dfc5a98aadd06d295ac2ac7382f18cf81bd48c990d3179ffd7aae8b
6
+ metadata.gz: 07764bfcfa64f4bb667cf7267055e136a112b8734d82c3a55691f40f2f719eedca6398f9d26b7d079f67f85bbd4341032edb3031403d6a595e3bbda66efcc3e1
7
+ data.tar.gz: 6b06c451c6ae2c5ddac1097e391e321d3b4bbbc539b30b54f8ab2a9a694d098a60b450f062363b25c7159e3a2b813c29fe6d90c28e75d641c0a1b14f62b5b641
data/lib/bosh/director/cloudcheck_helper.rb CHANGED
@@ -100,6 +100,12 @@ module Bosh::Director
100
100
  instance = vm.instance
101
101
  disk_cid = instance ? instance.persistent_disk_cid : nil
102
102
 
103
+ begin
104
+ cloud.detach_disk(vm.cid, disk_cid) if disk_cid
105
+ rescue Bosh::Clouds::DiskNotAttached
106
+ @logger.warn("Disk cid '#{disk_cid}' detected, but the disk is already detached")
107
+ end
108
+
103
109
  # One situation where this handler is actually useful is when
104
110
  # VM has already been deleted but something failed after that
105
111
  # and it is still referenced in DB. In that case it makes sense
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2751.0'
3
+ VERSION = '1.2754.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2751.0
4
+ version: 1.2754.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-24 00:00:00.000000000 Z
11
+ date: 2014-10-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2751.0
33
+ version: 1.2754.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2751.0
40
+ version: 1.2754.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2751.0
47
+ version: 1.2754.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.2751.0
54
+ version: 1.2754.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-director-core
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2751.0
61
+ version: 1.2754.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.2751.0
68
+ version: 1.2754.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh_common
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.2751.0
75
+ version: 1.2754.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.2751.0
82
+ version: 1.2754.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-template
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.2751.0
89
+ version: 1.2754.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.2751.0
96
+ version: 1.2754.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh_cpi
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.2751.0
103
+ version: 1.2754.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.2751.0
110
+ version: 1.2754.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2751.0
117
+ version: 1.2754.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.2751.0
124
+ version: 1.2754.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: bosh_aws_cpi
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.2751.0
131
+ version: 1.2754.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.2751.0
138
+ version: 1.2754.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: bosh_vsphere_cpi
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 1.2751.0
145
+ version: 1.2754.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 1.2751.0
152
+ version: 1.2754.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_warden_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.2751.0
159
+ version: 1.2754.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.2751.0
166
+ version: 1.2754.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: bosh_vcloud_cpi
169
169
  requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
460
460
  version: '0'
461
461
  description: |-
462
462
  BOSH Director
463
- 93858a
463
+ 9fe2b2
464
464
  email: support@cloudfoundry.com
465
465
  executables:
466
466
  - bosh-director