bosh_aws_cpi 1.2524.0 → 1.2531.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/cloud/aws/instance_manager.rb +8 -1
  2. data/lib/cloud/aws/version.rb +1 -1
  3. metadata +10 -10
data/lib/cloud/aws/instance_manager.rb CHANGED
@@ -202,9 +202,16 @@ module Bosh::AwsCloud
202
202
  def set_vpc_parameters(network_spec)
203
203
  manual_network_spec = network_spec.values.select { |spec| ["manual", nil].include? spec["type"] }.first
204
204
  if manual_network_spec
205
- instance_params[:subnet] = @region.subnets[manual_network_spec["cloud_properties"]["subnet"]]
206
205
  instance_params[:private_ip_address] = manual_network_spec["ip"]
207
206
  end
207
+
208
+ subnet_network_spec = network_spec.values.select { |spec|
209
+ ["manual", nil, "dynamic"].include?(spec["type"]) &&
210
+ spec.fetch("cloud_properties", {}).has_key?("subnet")
211
+ }.first
212
+ if subnet_network_spec
213
+ instance_params[:subnet] = @region.subnets[subnet_network_spec["cloud_properties"]["subnet"]]
214
+ end
208
215
  end
209
216
 
210
217
  def set_availability_zone_parameter(volume_zones, resource_pool_zone, subnet_zone)
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2524.0'
3
+ VERSION = '1.2531.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.2524.0
4
+ version: 1.2531.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: 2014-05-01 00:00:00.000000000 Z
12
+ date: 2014-05-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aws-sdk
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.2524.0
37
+ version: 1.2531.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.2524.0
45
+ version: 1.2531.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.2524.0
53
+ version: 1.2531.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.2524.0
61
+ version: 1.2531.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.2524.0
69
+ version: 1.2531.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.2524.0
77
+ version: 1.2531.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
- 0501e4'
112
+ b4fb49'
113
113
  email: support@cloudfoundry.com
114
114
  executables:
115
115
  - bosh_aws_console
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
159
159
  version: '0'
160
160
  segments:
161
161
  - 0
162
- hash: -1154524366026953427
162
+ hash: 3710429992945596373
163
163
  requirements: []
164
164
  rubyforge_project:
165
165
  rubygems_version: 1.8.23