bosh_aws_cpi 1.2754.0 → 1.2765.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/cloud.rb +9 -2
  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: caa73f8b34b885d348d05cde27c767bdf68393a6
4
- data.tar.gz: 61fdafe37d7d395f90002ad35d8ddcf289c285d3
3
+ metadata.gz: f4de4aa18b2328e9727ed9461c83123ab1b486ac
4
+ data.tar.gz: 16b1f7d67ae22bc99257eab5104806d9223137b3
5
5
  SHA512:
6
- metadata.gz: 7dfc60101d494303d26b53f8c070f83fc00f9085a3cff2b175d3f10a2984609057c84306167ce982b0966296da20527a5e87b8b913553a3e5978c37346c3592f
7
- data.tar.gz: bf5d5369665d923ce3bafcc063385b43e13af046fb0b8544f403420778ee76b22b352b500b6b5b9470e44fe6fad22ac2044d6706ce61324874095474da4415e7
6
+ metadata.gz: 4a4b56cdaf8d5301b9383d682d928c4983219a05ef39ae3c90b8448158b82f5e7a0cac738318b3aaf5fccb530fa02819261c4d17142667a8cd49fd9d4e5d13a4
7
+ data.tar.gz: 499d0d9b43bb74ed39999d61b1d327d1677224a0b4c038a9fbf7d51b3437335fb9e794d499d8929b98071832601627953202e089a657927f04bbbffe39d05e80
data/lib/cloud/aws/cloud.rb CHANGED
@@ -516,13 +516,20 @@ module Bosh::AwsCloud
516
516
  aws_params = {
517
517
  access_key_id: aws_properties['access_key_id'],
518
518
  secret_access_key: aws_properties['secret_access_key'],
519
+ region: aws_properties['region'],
519
520
  ec2_endpoint: aws_properties['ec2_endpoint'] || default_ec2_endpoint,
520
521
  elb_endpoint: aws_properties['elb_endpoint'] || default_elb_endpoint,
521
- max_retries: aws_properties['max_retries'] || DEFAULT_MAX_RETRIES ,
522
+ max_retries: aws_properties['max_retries'] || DEFAULT_MAX_RETRIES,
522
523
  logger: aws_logger
523
524
  }
524
525
 
525
- aws_params[:proxy_uri] = aws_properties['proxy_uri'] if aws_properties['proxy_uri']
526
+ %w(
527
+ http_read_timeout
528
+ http_wire_trace
529
+ proxy_uri
530
+ ).each do |k|
531
+ aws_params[k.to_sym] = aws_properties[k] if aws_properties[k]
532
+ end
526
533
 
527
534
  # AWS Ruby SDK is threadsafe but Ruby autoload isn't,
528
535
  # so we need to trigger eager autoload while constructing CPI
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2754.0'
3
+ VERSION = '1.2765.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.2754.0
4
+ version: 1.2765.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-28 00:00:00.000000000 Z
11
+ date: 2014-11-05 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.2754.0
33
+ version: 1.2765.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.2754.0
40
+ version: 1.2765.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.2754.0
47
+ version: 1.2765.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.2754.0
54
+ version: 1.2765.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.2754.0
61
+ version: 1.2765.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.2754.0
68
+ version: 1.2765.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
- 9fe2b2
99
+ ae0a5a
100
100
  email: support@cloudfoundry.com
101
101
  executables:
102
102
  - aws_cpi