bosh_cli_plugin_micro 1.2865.0 → 1.2881.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/deployer/configuration.rb +5 -2
  3. data/lib/bosh/deployer/deployments_state.rb +1 -5
  4. data/lib/bosh/deployer/instance_manager.rb +1 -1
  5. data/lib/bosh/deployer/instance_manager/aws.rb +0 -4
  6. data/lib/bosh/deployer/instance_manager/openstack.rb +0 -4
  7. data/lib/bosh/deployer/instance_manager/vcloud.rb +0 -4
  8. data/lib/bosh/deployer/instance_manager/vsphere.rb +1 -9
  9. data/lib/bosh/deployer/version.rb +1 -1
  10. metadata +107 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 815aa7636b66208b5e14ebc6bf1bda0be3d8f3ce
4
- data.tar.gz: 25174c2df4646781de06c5aebf0434075a291ba9
3
+ metadata.gz: 9e9f57c8180e19c8d1d626aa57531da6365e3cb0
4
+ data.tar.gz: e8f27c6691dc346bea9a441483a3a9084c192ed5
5
5
  SHA512:
6
- metadata.gz: efd6d6c31a953dad9c47a0b42a1f97129041a5490fa9a2d4967d68b9e4d4a494c98e8bf6af1f893949cf883a4ecf5719de894a89c58ccb15badef0904a207cac
7
- data.tar.gz: ff8fcb34992f126c51ec295d5c7604831843f4f82cff58ab7c4353fbec4d02a27ac5766809cf4bc29e2cdd64c44bbe01c0e181dc7da57dad281396ea0446731a
6
+ metadata.gz: 5d1a7ba7c064779356d17d2701c1122b867613ac48acdb3c8c77eaf667b2f1eeeaa327a62c127047260f2316a8f6e45005ad207f4520a318d57fc55f09da8e05
7
+ data.tar.gz: fd4177c05eb258d43d179ff67c3124b85366b2ba0a6e5bc4c6d3fcae999c939f97b42a0a0dfaeeb9056322572fdf23f013e19926e8f846015fc5bb6fc5d00a87
data/lib/bosh/deployer/configuration.rb CHANGED
@@ -24,7 +24,11 @@ module Bosh::Deployer
24
24
  @env = config['env']
25
25
  @deployment_network = config['deployment_network']
26
26
 
27
- @logger = MonoLogger.new(config['logging']['file'] || STDOUT)
27
+ log_io = config['logging']['file'] || STDOUT
28
+ if log_io.is_a?(String)
29
+ log_io = File.open(log_io, (File::WRONLY | File::APPEND | File::CREAT))
30
+ end
31
+ @logger = MonoLogger.new(log_io)
28
32
  @logger.level = MonoLogger.const_get(config['logging']['level'].upcase)
29
33
  @logger.formatter = ThreadFormatter.new
30
34
 
@@ -56,7 +60,6 @@ module Bosh::Deployer
56
60
  @cloud_options['properties']['agent']['mbus'] ||=
57
61
  'https://vcap:b00tstrap@0.0.0.0:6868'
58
62
 
59
- @disk_model = nil
60
63
  @cloud = nil
61
64
  @networks = nil
62
65
  @uuid = SecureRandom.uuid
data/lib/bosh/deployer/deployments_state.rb CHANGED
@@ -24,8 +24,7 @@ module Bosh::Deployer
24
24
  @file = file
25
25
  end
26
26
 
27
- def load_deployment(name, infrastructure)
28
- infrastructure.disk_model.insert_multiple(deployments['disks']) if infrastructure.disk_model
27
+ def load_deployment(name)
29
28
  models_instance.insert_multiple(deployments['instances'])
30
29
 
31
30
  @state = models_instance.find(name: name)
@@ -41,9 +40,6 @@ module Bosh::Deployer
41
40
  def save(infrastructure)
42
41
  state.save
43
42
  deployments['instances'] = models_instance.map { |instance| instance.values }
44
- if infrastructure.disk_model
45
- deployments['disks'] = infrastructure.disk_model.map { |disk| disk.values }
46
- end
47
43
 
48
44
  File.open(file, 'w') do |file|
49
45
  file.write(Psych.dump(deployments))
data/lib/bosh/deployer/instance_manager.rb CHANGED
@@ -50,7 +50,7 @@ module Bosh::Deployer
50
50
  @infrastructure = plugin_class.new(self, config, logger)
51
51
 
52
52
  @deployments_state = DeploymentsState.load_from_dir(config.base_dir, logger)
53
- deployments_state.load_deployment(config.name, infrastructure)
53
+ deployments_state.load_deployment(config.name)
54
54
 
55
55
  config.uuid = state.uuid
56
56
 
data/lib/bosh/deployer/instance_manager/aws.rb CHANGED
@@ -29,10 +29,6 @@ module Bosh::Deployer
29
29
  @remote_tunnel.create(instance_manager.client_services_ip, registry.port)
30
30
  end
31
31
 
32
- def disk_model
33
- nil
34
- end
35
-
36
32
  def update_spec(spec)
37
33
  properties = spec.properties
38
34
 
data/lib/bosh/deployer/instance_manager/openstack.rb CHANGED
@@ -28,10 +28,6 @@ module Bosh::Deployer
28
28
  @remote_tunnel.create(instance_manager.client_services_ip, registry.port)
29
29
  end
30
30
 
31
- def disk_model
32
- nil
33
- end
34
-
35
31
  def update_spec(spec)
36
32
  properties = spec.properties
37
33
 
data/lib/bosh/deployer/instance_manager/vcloud.rb CHANGED
@@ -16,10 +16,6 @@ module Bosh::Deployer
16
16
  # to bosh-registry is required
17
17
  end
18
18
 
19
- def disk_model
20
- nil
21
- end
22
-
23
19
  def update_spec(spec)
24
20
  properties = spec.properties
25
21
 
data/lib/bosh/deployer/instance_manager/vsphere.rb CHANGED
@@ -14,14 +14,6 @@ module Bosh::Deployer
14
14
  def remote_tunnel
15
15
  end
16
16
 
17
- def disk_model
18
- if @disk_model.nil?
19
- require 'cloud/vsphere'
20
- @disk_model = VSphereCloud::Models::Disk
21
- end
22
- @disk_model
23
- end
24
-
25
17
  def update_spec(spec)
26
18
  properties = spec.properties
27
19
 
@@ -53,7 +45,7 @@ module Bosh::Deployer
53
45
 
54
46
  # @return [Integer] size in MiB
55
47
  def disk_size(cid)
56
- disk_model.first(uuid: cid).size
48
+ instance_manager.cloud.disk_provider.find(cid).size_in_mb
57
49
  end
58
50
 
59
51
  def persistent_disk_changed?
data/lib/bosh/deployer/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Deployer
3
- VERSION = '1.2865.0'
3
+ VERSION = '1.2881.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli_plugin_micro
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2865.0
4
+ version: 1.2881.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-03-06 00:00:00.000000000 Z
11
+ date: 2015-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sqlite3
@@ -38,104 +38,118 @@ dependencies:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 1.1.0
41
+ - !ruby/object:Gem::Dependency
42
+ name: bosh-core
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: 1.2881.0
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: 1.2881.0
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: bosh_cli
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - "~>"
46
60
  - !ruby/object:Gem::Version
47
- version: 1.2865.0
61
+ version: 1.2881.0
48
62
  type: :runtime
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - "~>"
53
67
  - !ruby/object:Gem::Version
54
- version: 1.2865.0
68
+ version: 1.2881.0
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: bosh-stemcell
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
73
  - - "~>"
60
74
  - !ruby/object:Gem::Version
61
- version: 1.2865.0
75
+ version: 1.2881.0
62
76
  type: :runtime
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
80
  - - "~>"
67
81
  - !ruby/object:Gem::Version
68
- version: 1.2865.0
82
+ version: 1.2881.0
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: bosh-registry
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
87
  - - "~>"
74
88
  - !ruby/object:Gem::Version
75
- version: 1.2865.0
89
+ version: 1.2881.0
76
90
  type: :runtime
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
94
  - - "~>"
81
95
  - !ruby/object:Gem::Version
82
- version: 1.2865.0
96
+ version: 1.2881.0
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: agent_client
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: 1.2865.0
103
+ version: 1.2881.0
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: 1.2865.0
110
+ version: 1.2881.0
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: bosh_cpi
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: 1.2865.0
117
+ version: 1.2881.0
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - "~>"
109
123
  - !ruby/object:Gem::Version
110
- version: 1.2865.0
124
+ version: 1.2881.0
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: bosh_aws_cpi
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: 1.2865.0
131
+ version: 1.2881.0
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - "~>"
123
137
  - !ruby/object:Gem::Version
124
- version: 1.2865.0
138
+ version: 1.2881.0
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: bosh_openstack_cpi
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
143
  - - "~>"
130
144
  - !ruby/object:Gem::Version
131
- version: 1.2865.0
145
+ version: 1.2881.0
132
146
  type: :runtime
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
150
  - - "~>"
137
151
  - !ruby/object:Gem::Version
138
- version: 1.2865.0
152
+ version: 1.2881.0
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: bosh_vcloud_cpi
141
155
  requirement: !ruby/object:Gem::Requirement
@@ -156,45 +170,115 @@ dependencies:
156
170
  requirements:
157
171
  - - "~>"
158
172
  - !ruby/object:Gem::Version
159
- version: 1.2865.0
173
+ version: 1.2881.0
160
174
  type: :runtime
161
175
  prerelease: false
162
176
  version_requirements: !ruby/object:Gem::Requirement
163
177
  requirements:
164
178
  - - "~>"
165
179
  - !ruby/object:Gem::Version
166
- version: 1.2865.0
180
+ version: 1.2881.0
167
181
  - !ruby/object:Gem::Dependency
168
182
  name: bosh-director-core
169
183
  requirement: !ruby/object:Gem::Requirement
170
184
  requirements:
171
185
  - - "~>"
172
186
  - !ruby/object:Gem::Version
173
- version: 1.2865.0
187
+ version: 1.2881.0
174
188
  type: :runtime
175
189
  prerelease: false
176
190
  version_requirements: !ruby/object:Gem::Requirement
177
191
  requirements:
178
192
  - - "~>"
179
193
  - !ruby/object:Gem::Version
180
- version: 1.2865.0
194
+ version: 1.2881.0
181
195
  - !ruby/object:Gem::Dependency
182
196
  name: blobstore_client
183
197
  requirement: !ruby/object:Gem::Requirement
184
198
  requirements:
185
199
  - - "~>"
186
200
  - !ruby/object:Gem::Version
187
- version: 1.2865.0
201
+ version: 1.2881.0
188
202
  type: :runtime
189
203
  prerelease: false
190
204
  version_requirements: !ruby/object:Gem::Requirement
191
205
  requirements:
192
206
  - - "~>"
193
207
  - !ruby/object:Gem::Version
194
- version: 1.2865.0
208
+ version: 1.2881.0
209
+ - !ruby/object:Gem::Dependency
210
+ name: rake
211
+ requirement: !ruby/object:Gem::Requirement
212
+ requirements:
213
+ - - ">="
214
+ - !ruby/object:Gem::Version
215
+ version: '0'
216
+ type: :development
217
+ prerelease: false
218
+ version_requirements: !ruby/object:Gem::Requirement
219
+ requirements:
220
+ - - ">="
221
+ - !ruby/object:Gem::Version
222
+ version: '0'
223
+ - !ruby/object:Gem::Dependency
224
+ name: rspec
225
+ requirement: !ruby/object:Gem::Requirement
226
+ requirements:
227
+ - - ">="
228
+ - !ruby/object:Gem::Version
229
+ version: '0'
230
+ type: :development
231
+ prerelease: false
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ requirements:
234
+ - - ">="
235
+ - !ruby/object:Gem::Version
236
+ version: '0'
237
+ - !ruby/object:Gem::Dependency
238
+ name: rspec-its
239
+ requirement: !ruby/object:Gem::Requirement
240
+ requirements:
241
+ - - ">="
242
+ - !ruby/object:Gem::Version
243
+ version: '0'
244
+ type: :development
245
+ prerelease: false
246
+ version_requirements: !ruby/object:Gem::Requirement
247
+ requirements:
248
+ - - ">="
249
+ - !ruby/object:Gem::Version
250
+ version: '0'
251
+ - !ruby/object:Gem::Dependency
252
+ name: fakefs
253
+ requirement: !ruby/object:Gem::Requirement
254
+ requirements:
255
+ - - ">="
256
+ - !ruby/object:Gem::Version
257
+ version: '0'
258
+ type: :development
259
+ prerelease: false
260
+ version_requirements: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - ">="
263
+ - !ruby/object:Gem::Version
264
+ version: '0'
265
+ - !ruby/object:Gem::Dependency
266
+ name: timecop
267
+ requirement: !ruby/object:Gem::Requirement
268
+ requirements:
269
+ - - ">="
270
+ - !ruby/object:Gem::Version
271
+ version: '0'
272
+ type: :development
273
+ prerelease: false
274
+ version_requirements: !ruby/object:Gem::Requirement
275
+ requirements:
276
+ - - ">="
277
+ - !ruby/object:Gem::Version
278
+ version: '0'
195
279
  description: |-
196
280
  BOSH CLI plugin for Micro BOSH deployment
197
- 14ebaf
281
+ 756fc2
198
282
  email: support@cloudfoundry.com
199
283
  executables: []
200
284
  extensions: []