bosh_aws_cpi 1.2922.0 → 1.2941.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 +28 -30
  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: 9cad1b71346d2a3b5ad51b6331f71f903b578cbb
4
- data.tar.gz: cbb84a7d0c71c04d8b0fe9ce834f0e108e6bfe86
3
+ metadata.gz: 0f52b463fbfd8df09016445364d1bda2060b72e2
4
+ data.tar.gz: 898b12577792c26a9765e3e87aa0e5914f4fc905
5
5
  SHA512:
6
- metadata.gz: 888617b2841055841d105fcb46cfbd6f418abb1ad0e9652fa83fae7baf1b65452f2fd60538a6e11bb0851d61b44853ed47a50211d87e1be8d589d26637544073
7
- data.tar.gz: 0ac64e1381fc8eb6e49d11ca4cce99554a7918e6af2e2d7d0b33f8c7cf214ae948a9eada283acf56a9c7f9f3d58632bea64cf559557ff7f0e8ce0bba1774d715
6
+ metadata.gz: d690f24890c32a88ecc266b6f1edcd35932d61c81ae746f72461448ee9be3abc65e6a2c6372075a7fe3651464e172e8627a6865eeb7c087d7f6a1b5f4fe84f1a
7
+ data.tar.gz: b5f740189fabc208f06d409afcfff227f4acf84ac4a466bed3cec201f2e99ef225200e73c93b597dfed74c605ee7e97639094c7e98c048961ee204b6cd7b7b03
data/lib/cloud/aws/cloud.rb CHANGED
@@ -27,11 +27,37 @@ module Bosh::AwsCloud
27
27
  validate_options
28
28
 
29
29
  @logger = Bosh::Clouds::Config.logger
30
+ aws_logger = @logger
31
+
32
+ @aws_params = {
33
+ access_key_id: aws_properties['access_key_id'],
34
+ secret_access_key: aws_properties['secret_access_key'],
35
+ region: aws_properties['region'],
36
+ ec2_endpoint: aws_properties['ec2_endpoint'] || default_ec2_endpoint,
37
+ elb_endpoint: aws_properties['elb_endpoint'] || default_elb_endpoint,
38
+ max_retries: aws_properties['max_retries'] || DEFAULT_MAX_RETRIES,
39
+ logger: aws_logger
40
+ }
41
+
42
+ %w(
43
+ http_read_timeout
44
+ http_wire_trace
45
+ proxy_uri
46
+ ssl_verify_peer
47
+ ssl_ca_file
48
+ ssl_ca_path
49
+ ).each do |k|
50
+ @aws_params[k.to_sym] = aws_properties[k] unless aws_properties[k].nil?
51
+ end
52
+
53
+ # AWS Ruby SDK is threadsafe but Ruby autoload isn't,
54
+ # so we need to trigger eager autoload while constructing CPI
55
+ AWS.eager_autoload!
30
56
 
31
57
  initialize_aws
32
58
  initialize_registry
33
59
 
34
- elb = AWS::ELB.new
60
+ elb = AWS::ELB.new(access_key_id: @aws_params[:access_key_id], secret_access_key: @aws_params[:secret_access_key])
35
61
 
36
62
  @instance_manager = InstanceManager.new(region, registry, elb, az_selector, @logger)
37
63
 
@@ -512,35 +538,7 @@ module Bosh::AwsCloud
512
538
  end
513
539
 
514
540
  def initialize_aws
515
- aws_logger = logger
516
- aws_params = {
517
- access_key_id: aws_properties['access_key_id'],
518
- secret_access_key: aws_properties['secret_access_key'],
519
- region: aws_properties['region'],
520
- ec2_endpoint: aws_properties['ec2_endpoint'] || default_ec2_endpoint,
521
- elb_endpoint: aws_properties['elb_endpoint'] || default_elb_endpoint,
522
- max_retries: aws_properties['max_retries'] || DEFAULT_MAX_RETRIES,
523
- logger: aws_logger
524
- }
525
-
526
- %w(
527
- http_read_timeout
528
- http_wire_trace
529
- proxy_uri
530
- ssl_verify_peer
531
- ssl_ca_file
532
- ssl_ca_path
533
- ).each do |k|
534
- aws_params[k.to_sym] = aws_properties[k] unless aws_properties[k].nil?
535
- end
536
-
537
- # AWS Ruby SDK is threadsafe but Ruby autoload isn't,
538
- # so we need to trigger eager autoload while constructing CPI
539
- AWS.eager_autoload!
540
-
541
- AWS.config(aws_params)
542
-
543
- @ec2 = AWS::EC2.new
541
+ @ec2 = AWS::EC2.new(@aws_params)
544
542
  @region = @ec2.regions[aws_region]
545
543
  @az_selector = AvailabilityZoneSelector.new(@region, aws_properties['default_availability_zone'])
546
544
  end
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2922.0'
3
+ VERSION = '1.2941.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.2922.0
4
+ version: 1.2941.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-04-10 00:00:00.000000000 Z
11
+ date: 2015-04-21 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.2922.0
33
+ version: 1.2941.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.2922.0
40
+ version: 1.2941.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.2922.0
47
+ version: 1.2941.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.2922.0
54
+ version: 1.2941.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.2922.0
61
+ version: 1.2941.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.2922.0
68
+ version: 1.2941.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
- 3778c5
141
+ 8ac133
142
142
  email: support@cloudfoundry.com
143
143
  executables:
144
144
  - aws_cpi