bosh_aws_cpi 1.2811.0 → 1.2818.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/cloud/aws/cloud.rb +3 -8
  2. data/lib/cloud/aws/version.rb +1 -1
  3. metadata +12 -12
data/lib/cloud/aws/cloud.rb CHANGED
@@ -166,18 +166,12 @@ module Bosh::AwsCloud
166
166
  with_thread_name("create_disk(#{size}, #{instance_id})") do
167
167
  validate_disk_size(size)
168
168
 
169
- if cloud_properties.has_key?('type')
170
- validate_disk_type(cloud_properties['type'])
171
- volume_type = cloud_properties['type']
172
- else
173
- volume_type = 'standard'
174
- end
175
-
176
169
  # if the disk is created for an instance, use the same availability zone as they must match
177
170
  volume = @ec2.volumes.create(
178
171
  size: (size / 1024.0).ceil,
179
172
  availability_zone: @az_selector.select_availability_zone(instance_id),
180
- volume_type: volume_type
173
+ volume_type: validate_disk_type(cloud_properties.fetch('type', 'standard')),
174
+ encrypted: cloud_properties.fetch('encrypted', false)
181
175
  )
182
176
 
183
177
  logger.info("Creating volume '#{volume.id}'")
@@ -198,6 +192,7 @@ module Bosh::AwsCloud
198
192
  unless %w[gp2 standard].include?(type)
199
193
  cloud_error('AWS CPI supports only gp2 or standard disk type')
200
194
  end
195
+ type
201
196
  end
202
197
 
203
198
  ##
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2811.0'
3
+ VERSION = '1.2818.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_aws_cpi
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2811.0
4
+ version: 1.2818.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-01-10 00:00:00.000000000 Z
12
+ date: 2015-01-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aws-sdk
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 1.44.0
21
+ version: 1.60.2
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 1.44.0
29
+ version: 1.60.2
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: bosh_common
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.2811.0
37
+ version: 1.2818.0
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.2811.0
45
+ version: 1.2818.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh_cpi
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.2811.0
53
+ version: 1.2818.0
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.2811.0
61
+ version: 1.2818.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-registry
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.2811.0
69
+ version: 1.2818.0
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.2811.0
77
+ version: 1.2818.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: httpclient
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: 0.8.2
110
110
  description: ! 'BOSH AWS CPI
111
111
 
112
- e460f9'
112
+ 59d102'
113
113
  email: support@cloudfoundry.com
114
114
  executables:
115
115
  - aws_cpi
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
163
163
  version: '0'
164
164
  segments:
165
165
  - 0
166
- hash: -2650463579847981588
166
+ hash: -431903187477590241
167
167
  requirements: []
168
168
  rubyforge_project:
169
169
  rubygems_version: 1.8.23