bosh_cli_plugin_micro 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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/deployer/configuration.rb +3 -2
  3. data/lib/bosh/deployer/instance_manager.rb +6 -2
  4. data/lib/bosh/deployer/version.rb +1 -1
  5. metadata +37 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5985285fa9a2ddc9f08a908cfe465ecf704890e8
4
- data.tar.gz: ede16efc3aa412350f03528a0f2735a64cbd903f
3
+ metadata.gz: dac06872bbe85e49c7ce0cc675dbdebd38dfef72
4
+ data.tar.gz: 879938897a86196cad2f7842ae06c66635f61e89
5
5
  SHA512:
6
- metadata.gz: a7e94fe02bd6a842a15696482b792940cc3859aa7b23bd1debec915e8b1330504846749deb32c561fe31ebf99753f696780634181f133bd212098ee2c5df7b49
7
- data.tar.gz: c341191241dcbe3eb8f51baa936e80851669bb136b9a8b458f185047bc9e1acd378df3823d9a14858173a690a13f793289259203b0470ac1049d8187f2eed0d3
6
+ metadata.gz: 090c9d6b93da896e02fca2249325a9d9685dcc03345e844aca67bb5e8a14a05a91033d3f4947e9beef6f6ecef05207fa77043e1a765365443946a77eb5b50d8a
7
+ data.tar.gz: d8a4b42e525c003b9aafb4abd8cc59bfb82b71a03df2a1537c150c2b64827836322c6924d323ebd18c012486b7f05d9345f8489f548f8bb6234e21715784a62d
data/lib/bosh/deployer/configuration.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'bosh/deployer/models/instance'
2
2
  require 'bosh/deployer/infrastructure_defaults'
3
+ require 'mono_logger'
3
4
 
4
5
  module Bosh::Deployer
5
6
  class Configuration
@@ -23,8 +24,8 @@ module Bosh::Deployer
23
24
  @env = config['env']
24
25
  @deployment_network = config['deployment_network']
25
26
 
26
- @logger = Logger.new(config['logging']['file'] || STDOUT)
27
- @logger.level = Logger.const_get(config['logging']['level'].upcase)
27
+ @logger = MonoLogger.new(config['logging']['file'] || STDOUT)
28
+ @logger.level = MonoLogger.const_get(config['logging']['level'].upcase)
28
29
  @logger.formatter = ThreadFormatter.new
29
30
 
30
31
  apply_spec = config['apply_spec']
data/lib/bosh/deployer/instance_manager.rb CHANGED
@@ -279,11 +279,15 @@ module Bosh::Deployer
279
279
  def create_disk
280
280
  step 'Create disk' do
281
281
  size = config.resources['persistent_disk']
282
- state.disk_cid = cloud.create_disk(size, {}, state.vm_cid)
282
+ state.disk_cid = cloud.create_disk(size, persistent_disk_cloud_properties, state.vm_cid)
283
283
  save_state
284
284
  end
285
285
  end
286
286
 
287
+ def persistent_disk_cloud_properties
288
+ config.resources.fetch('persistent_disk_cloud_properties', {})
289
+ end
290
+
287
291
  # it is up to the caller to save/update disk state info
288
292
  def delete_disk(disk_cid, vm_cid)
289
293
  unmount_disk(disk_cid)
@@ -354,7 +358,7 @@ module Bosh::Deployer
354
358
  old_disk_cid = state.disk_cid
355
359
 
356
360
  # create a new disk and attach it
357
- new_disk_cid = cloud.create_disk(size, {}, state.vm_cid)
361
+ new_disk_cid = cloud.create_disk(size, persistent_disk_cloud_properties, state.vm_cid)
358
362
  attach_disk(new_disk_cid, true)
359
363
 
360
364
  # migrate data (which mounts the disks)
data/lib/bosh/deployer/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Deployer
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_cli_plugin_micro
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: sqlite3
@@ -24,104 +24,118 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 1.3.7
27
+ - !ruby/object:Gem::Dependency
28
+ name: mono_logger
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: 1.1.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: 1.1.0
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: bosh_cli
29
43
  requirement: !ruby/object:Gem::Requirement
30
44
  requirements:
31
45
  - - "~>"
32
46
  - !ruby/object:Gem::Version
33
- version: 1.2751.0
47
+ version: 1.2754.0
34
48
  type: :runtime
35
49
  prerelease: false
36
50
  version_requirements: !ruby/object:Gem::Requirement
37
51
  requirements:
38
52
  - - "~>"
39
53
  - !ruby/object:Gem::Version
40
- version: 1.2751.0
54
+ version: 1.2754.0
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: bosh-stemcell
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - "~>"
46
60
  - !ruby/object:Gem::Version
47
- version: 1.2751.0
61
+ version: 1.2754.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.2751.0
68
+ version: 1.2754.0
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: bosh-registry
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
73
  - - "~>"
60
74
  - !ruby/object:Gem::Version
61
- version: 1.2751.0
75
+ version: 1.2754.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.2751.0
82
+ version: 1.2754.0
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: agent_client
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
87
  - - "~>"
74
88
  - !ruby/object:Gem::Version
75
- version: 1.2751.0
89
+ version: 1.2754.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.2751.0
96
+ version: 1.2754.0
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: bosh_cpi
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: 1.2751.0
103
+ version: 1.2754.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.2751.0
110
+ version: 1.2754.0
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: bosh_aws_cpi
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: 1.2751.0
117
+ version: 1.2754.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.2751.0
124
+ version: 1.2754.0
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: bosh_openstack_cpi
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: 1.2751.0
131
+ version: 1.2754.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.2751.0
138
+ version: 1.2754.0
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: bosh_vcloud_cpi
127
141
  requirement: !ruby/object:Gem::Requirement
@@ -142,45 +156,45 @@ dependencies:
142
156
  requirements:
143
157
  - - "~>"
144
158
  - !ruby/object:Gem::Version
145
- version: 1.2751.0
159
+ version: 1.2754.0
146
160
  type: :runtime
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
164
  - - "~>"
151
165
  - !ruby/object:Gem::Version
152
- version: 1.2751.0
166
+ version: 1.2754.0
153
167
  - !ruby/object:Gem::Dependency
154
168
  name: bosh-director-core
155
169
  requirement: !ruby/object:Gem::Requirement
156
170
  requirements:
157
171
  - - "~>"
158
172
  - !ruby/object:Gem::Version
159
- version: 1.2751.0
173
+ version: 1.2754.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.2751.0
180
+ version: 1.2754.0
167
181
  - !ruby/object:Gem::Dependency
168
182
  name: blobstore_client
169
183
  requirement: !ruby/object:Gem::Requirement
170
184
  requirements:
171
185
  - - "~>"
172
186
  - !ruby/object:Gem::Version
173
- version: 1.2751.0
187
+ version: 1.2754.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.2751.0
194
+ version: 1.2754.0
181
195
  description: |-
182
196
  BOSH CLI plugin for Micro BOSH deployment
183
- 93858a
197
+ 9fe2b2
184
198
  email: support@cloudfoundry.com
185
199
  executables: []
186
200
  extensions: []