bosh_aws_cpi 1.3033.0 → 1.3039.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/cloud/aws/instance_manager.rb +8 -12
  3. data/lib/cloud/aws/version.rb +1 -1
  4. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cbc96a4c3f40a40acd36f47f6be4992800cc4e64
4
- data.tar.gz: f33b0a53f5039e1e93711d16bb45bd1eabe38019
3
+ metadata.gz: aa4503c32b5e5a2343b7c85663c67df989cfb318
4
+ data.tar.gz: 6e53adcdf96f4d25450348629d9ed1d09cb272ec
5
5
  SHA512:
6
- metadata.gz: e0d242a36d9a523fd632b986ba4ad0e8e8f04c2afd596bbef4ea43096afd58840d6d64d40e77a59324aecf1df331711729123be47de57dbbf098d985253a988d
7
- data.tar.gz: f9a233942c57388873f45f6259784469551f8a47b2fc40e3c329279cf96a43ff26444937cd2216c3906a0f53146dfa26b98615f9b3a0d85b47573bc8b99e2a3d
6
+ metadata.gz: dd28d8e6721111007ada73d6514b809f828a896283d80515a5c63bbaf08c62d3cb6cb3a9e6d35b12f4130b369efcda93147d682fcbf1cf3e73e7ade09b6dfd88
7
+ data.tar.gz: bf78787444521a15649beae436cebce7445752142b30d29f0fa8ba547348e8fc7a9b6737c86765044086a92d207c568e13b0902e6302280751cd122cc22fc2c7
data/lib/cloud/aws/instance_manager.rb CHANGED
@@ -153,19 +153,15 @@ module Bosh::AwsCloud
153
153
  ephemeral_volume_type = ephemeral_disk_options.fetch('type', 'standard')
154
154
  instance_type = ephemeral_disk_options.fetch('instance_type', '')
155
155
 
156
- if ephemeral_volume_size_in_mb > 0
157
- instance_storage_size_gb = InstanceManager::InstanceStorageMap[instance_type]
158
-
159
- if instance_storage_size_gb != nil && instance_storage_size_gb >= ephemeral_volume_size_in_gb
160
- # Use instance storage as it is enough for the ephemeral disk
161
- @logger.debug('Use instance storage to create the virtual machine')
162
- block_device_mapping_param = default_ephemeral_disk_mapping
163
- else
164
- @logger.debug('Use EBS storage to create the virtual machine')
165
- block_device_mapping_param = ebs_ephemeral_disk_mapping ephemeral_volume_size_in_gb, ephemeral_volume_type
166
- end
156
+ instance_storage_size_gb = InstanceManager::InstanceStorageMap[instance_type]
157
+
158
+ if instance_storage_size_gb.nil? || instance_storage_size_gb < ephemeral_volume_size_in_gb
159
+ @logger.debug('Use EBS storage to create the virtual machine')
160
+
161
+ ephemeral_volume_size_in_gb = 10 if ephemeral_volume_size_in_gb == 0
162
+ block_device_mapping_param = ebs_ephemeral_disk_mapping ephemeral_volume_size_in_gb, ephemeral_volume_type
167
163
  else
168
- # m3 instances require that instance storage mappings be specified when the instance is created... [#84893804]
164
+ @logger.debug('Use instance storage to create the virtual machine')
169
165
  block_device_mapping_param = default_ephemeral_disk_mapping
170
166
  end
171
167
 
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.3033.0'
3
+ VERSION = '1.3039.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_aws_cpi
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3033.0
4
+ version: 1.3039.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-08-04 00:00:00.000000000 Z
11
+ date: 2015-08-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk
@@ -30,42 +30,42 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3033.0
33
+ version: 1.3039.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.3033.0
40
+ version: 1.3039.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh_cpi
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3033.0
47
+ version: 1.3039.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.3033.0
54
+ version: 1.3039.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-registry
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3033.0
61
+ version: 1.3039.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.3033.0
68
+ version: 1.3039.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: httpclient
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  version: '0'
139
139
  description: |-
140
140
  BOSH AWS CPI
141
- 2c1c13
141
+ e8cf4e
142
142
  email: support@cloudfoundry.com
143
143
  executables:
144
144
  - aws_cpi