bosh-director 1.2980.0 → 1.2981.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/config.rb +6 -1
  3. data/lib/bosh/director/version.rb +1 -1
  4. metadata +35 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 708c59acab7b2a6eb546e67a2d8d5db9309398f6
4
- data.tar.gz: 762b3833842953590adfa1fd6249a9f2eb6d26b8
3
+ metadata.gz: d43761f4c7fbd4f3997f89f31be19e32f5308e58
4
+ data.tar.gz: c80b622f3a9d9f8caa7cb72772cdd8d8275aa695
5
5
  SHA512:
6
- metadata.gz: 82cb75f699208ae8efb619276fb4269f974f02d7c77fb36a4d77652ddbccc7ce4a508512be987455de5076967c05952ca9f4033905c543fdd02aad761e20d96e
7
- data.tar.gz: 2da343450c1fe87325e1198cee0baa3e8325ddf84bc6b3f3b122e7ce63eac574c35f81091105fb79766453a7a40aca117f75958b5420883aba50c3fac4447b93
6
+ metadata.gz: a973eb9c2aace9e30a55fa37be2b1b5c6c58d37fc76cf19e4280a56ad72d71ac8ec03c97eb24e0258a09c99ec21803f162513d1d65c1794ecfc7847641bcb259
7
+ data.tar.gz: 2bf19477be7ced956c5ea8a38afc0228d107121bf2664bc9ce61a98628cd9817d009f8b0c191e81041ad64579894ce7eec0b17c4c57939b389fdfa5b7694a3d0
data/lib/bosh/director/config.rb CHANGED
@@ -307,11 +307,13 @@ module Bosh::Director
307
307
  end
308
308
  end
309
309
 
310
+ # Migrates director UUID to database
311
+ # Currently used by integration tests to set director UUID
310
312
  def override_uuid
311
313
  new_uuid = nil
312
314
  state_file = File.join(base_dir, 'state.json')
313
315
 
314
- if File.exists?(state_file)
316
+ begin
315
317
  open(state_file, 'r+') do |file|
316
318
 
317
319
  # Lock before read to avoid director/worker race condition
@@ -332,6 +334,9 @@ module Bosh::Director
332
334
  end
333
335
 
334
336
  FileUtils.rm_f(state_file)
337
+
338
+ rescue Errno::ENOENT
339
+ # Catch race condition since another process (director/worker) might migrated the state
335
340
  end
336
341
 
337
342
  new_uuid
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2980.0'
3
+ VERSION = '1.2981.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.2980.0
4
+ version: 1.2981.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-02 00:00:00.000000000 Z
11
+ date: 2015-06-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2980.0
33
+ version: 1.2981.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.2980.0
40
+ version: 1.2981.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.2980.0
47
+ version: 1.2981.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.2980.0
54
+ version: 1.2981.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.2980.0
61
+ version: 1.2981.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.2980.0
68
+ version: 1.2981.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.2980.0
75
+ version: 1.2981.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.2980.0
82
+ version: 1.2981.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.2980.0
89
+ version: 1.2981.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.2980.0
96
+ version: 1.2981.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.2980.0
103
+ version: 1.2981.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.2980.0
110
+ version: 1.2981.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.2980.0
117
+ version: 1.2981.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.2980.0
124
+ version: 1.2981.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.2980.0
131
+ version: 1.2981.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.2980.0
138
+ version: 1.2981.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.2980.0
145
+ version: 1.2981.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.2980.0
152
+ version: 1.2981.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_vcloud_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
180
  version: 1.0.0
181
+ - !ruby/object:Gem::Dependency
182
+ name: fog-aws
183
+ requirement: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - "<="
186
+ - !ruby/object:Gem::Version
187
+ version: 0.1.1
188
+ type: :runtime
189
+ prerelease: false
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - "<="
193
+ - !ruby/object:Gem::Version
194
+ version: 0.1.1
181
195
  - !ruby/object:Gem::Dependency
182
196
  name: fog
183
197
  requirement: !ruby/object:Gem::Requirement
@@ -558,7 +572,7 @@ dependencies:
558
572
  version: '0'
559
573
  description: |-
560
574
  BOSH Director
561
- cb6c5e
575
+ 4246cc
562
576
  email: support@cloudfoundry.com
563
577
  executables:
564
578
  - bosh-director