bosh-director 1.5.0.pre.1141 → 1.5.0.pre.1142

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/bosh/director/blobstores.rb +3 -7
  2. data/lib/bosh/director/config.rb +1 -1
  3. data/lib/bosh/director/version.rb +1 -1
  4. metadata +16 -16
data/lib/bosh/director/blobstores.rb CHANGED
@@ -1,14 +1,11 @@
1
- # Copyright (c) 2009-2012 VMware, Inc.
2
-
3
1
  module Bosh::Director
4
2
  class Blobstores
5
-
6
3
  attr_reader :blobstore
7
4
 
8
5
  def initialize(config)
9
- @blobstore = create_client(config.hash.fetch('blobstore'))
10
-
6
+ b_config = config.hash.fetch('blobstore')
11
7
  bd_config = config.hash['backup_destination']
8
+ @blobstore = create_client(b_config)
12
9
  @backup_destination = create_client(bd_config) if bd_config
13
10
  end
14
11
 
@@ -22,8 +19,7 @@ module Bosh::Director
22
19
  def create_client(hash)
23
20
  provider = hash.fetch('provider')
24
21
  options = hash.fetch('options')
25
-
26
- Bosh::Blobstore::Client.create(provider, options)
22
+ Bosh::Blobstore::Client.safe_create(provider, options)
27
23
  end
28
24
  end
29
25
  end
data/lib/bosh/director/config.rb CHANGED
@@ -166,7 +166,7 @@ module Bosh::Director
166
166
  if @compiled_package_cache_blobstore.nil? && use_compiled_package_cache?
167
167
  provider = @compiled_package_cache_options["provider"]
168
168
  options = @compiled_package_cache_options["options"]
169
- @compiled_package_cache_blobstore = Bosh::Blobstore::Client.create(provider, options)
169
+ @compiled_package_cache_blobstore = Bosh::Blobstore::Client.safe_create(provider, options)
170
170
  end
171
171
  end
172
172
  @compiled_package_cache_blobstore
data/lib/bosh/director/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bosh
4
4
  module Director
5
- VERSION = '1.5.0.pre.1141'
5
+ VERSION = '1.5.0.pre.1142'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0.pre.1141
4
+ version: 1.5.0.pre.1142
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.5.0.pre.1141
37
+ version: 1.5.0.pre.1142
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.5.0.pre.1141
45
+ version: 1.5.0.pre.1142
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-core
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 1.5.0.pre.1141
53
+ version: 1.5.0.pre.1142
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.5.0.pre.1141
61
+ version: 1.5.0.pre.1142
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh_common
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 1.5.0.pre.1141
69
+ version: 1.5.0.pre.1142
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.5.0.pre.1141
77
+ version: 1.5.0.pre.1142
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: bosh_cpi
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - ~>
84
84
  - !ruby/object:Gem::Version
85
- version: 1.5.0.pre.1141
85
+ version: 1.5.0.pre.1142
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ~>
92
92
  - !ruby/object:Gem::Version
93
- version: 1.5.0.pre.1141
93
+ version: 1.5.0.pre.1142
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh_openstack_cpi
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: 1.5.0.pre.1141
101
+ version: 1.5.0.pre.1142
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 1.5.0.pre.1141
109
+ version: 1.5.0.pre.1142
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_aws_cpi
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.5.0.pre.1141
117
+ version: 1.5.0.pre.1142
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.5.0.pre.1141
125
+ version: 1.5.0.pre.1142
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: bosh_vsphere_cpi
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ~>
132
132
  - !ruby/object:Gem::Version
133
- version: 1.5.0.pre.1141
133
+ version: 1.5.0.pre.1142
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - ~>
140
140
  - !ruby/object:Gem::Version
141
- version: 1.5.0.pre.1141
141
+ version: 1.5.0.pre.1142
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: eventmachine
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
445
445
  version: '1.0'
446
446
  description: ! 'BOSH Director
447
447
 
448
- 903d52'
448
+ 31eb14'
449
449
  email: support@cloudfoundry.com
450
450
  executables:
451
451
  - bosh-director