bosh_aws_cpi 1.2732.0 → 1.2739.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/stemcell_creator.rb +34 -14
  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: 68c5b5310ddb98d3b4ce3dbe00c14cfce445c973
4
- data.tar.gz: 9d2580a6ef68b56f93a8bb59d6991063c37aee25
3
+ metadata.gz: 3d3d596d0086c6ac7f372a72c2fa7e8e8ac6d620
4
+ data.tar.gz: faa1de88531a5ea6b0133cbcaed0316219cc9231
5
5
  SHA512:
6
- metadata.gz: 2a4de36e5d33c2ce1b49f0f988fe4e56c76335d52bc132c6de23faed6a2718884bec89704c338abddd348a57a8e71c6d4b2612da8e0d286df775d1b67cdf1776
7
- data.tar.gz: ad3fb0edd98191996508de8a41415a5daae5b2b83cf9d08da245bf9defaac59db57248bef92f7d715e306b24978234c051b94882159894385f176a7235847349
6
+ metadata.gz: d5b42bb9061f2466571ec9064533d7940dbee1e96fc9d1852a7bab3995dd994cb1f825d05cd5340adede2e7be589c6f159215a98b9a287d21b317bc0517ece0a
7
+ data.tar.gz: 10476285cbf2c1fce6473a99b4d145383395bc427f35eea32bb34b9e20104006db442f81216c0d8c9623b397eecb8ede7e8b1a9eca34993fe48548891bf98320
data/lib/cloud/aws/stemcell_creator.rb CHANGED
@@ -82,21 +82,33 @@ module Bosh::AwsCloud
82
82
  end
83
83
 
84
84
  def image_params(snapshot_id)
85
- root_device_name = stemcell_properties["root_device_name"]
86
85
  architecture = stemcell_properties["architecture"]
87
-
88
- aki = AKIPicker.new(region).pick(architecture, root_device_name)
89
-
90
- params = {
91
- :name => "BOSH-#{SecureRandom.uuid}",
92
- :architecture => architecture,
93
- :kernel_id => aki,
94
- :root_device_name => root_device_name,
95
- :block_device_mappings => {
96
- "/dev/sda" => {:snapshot_id => snapshot_id},
97
- "/dev/sdb" => "ephemeral0"
98
- }
99
- }
86
+ virtualization_type = stemcell_properties["virtualization_type"]
87
+
88
+ params = if virtualization_type == 'hvm'
89
+ {
90
+ :virtualization_type => virtualization_type,
91
+ :root_device_name => "/dev/xvda",
92
+ :block_device_mappings => {
93
+ "/dev/xvda" => {
94
+ :snapshot_id => snapshot_id
95
+ }
96
+ }
97
+ }
98
+ else
99
+ root_device_name = stemcell_properties["root_device_name"]
100
+ aki = AKIPicker.new(region).pick(architecture, root_device_name)
101
+
102
+ {
103
+ :kernel_id => aki,
104
+ :root_device_name => root_device_name,
105
+ :block_device_mappings => {
106
+ "/dev/sda" => {
107
+ :snapshot_id => snapshot_id
108
+ }
109
+ }
110
+ }
111
+ end
100
112
 
101
113
  # old stemcells doesn't have name & version
102
114
  if stemcell_properties["name"] && stemcell_properties["version"]
@@ -104,6 +116,14 @@ module Bosh::AwsCloud
104
116
  params[:description] = name
105
117
  end
106
118
 
119
+ params.merge!(
120
+ :name => "BOSH-#{SecureRandom.uuid}",
121
+ :architecture => architecture,
122
+ :block_device_mappings => params[:block_device_mappings].merge(
123
+ "/dev/sdb" => "ephemeral0"
124
+ )
125
+ )
126
+
107
127
  params
108
128
  end
109
129
 
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2732.0'
3
+ VERSION = '1.2739.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.2732.0
4
+ version: 1.2739.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-09-30 00:00:00.000000000 Z
11
+ date: 2014-10-09 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.2732.0
33
+ version: 1.2739.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.2732.0
40
+ version: 1.2739.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.2732.0
47
+ version: 1.2739.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.2732.0
54
+ version: 1.2739.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.2732.0
61
+ version: 1.2739.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.2732.0
68
+ version: 1.2739.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: httpclient
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
96
96
  version: 0.8.2
97
97
  description: |-
98
98
  BOSH AWS CPI
99
- f6dedd
99
+ 0d77bd
100
100
  email: support@cloudfoundry.com
101
101
  executables:
102
102
  - bosh_aws_console