bosh-registry 1.2781.0 → 1.2785.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/bosh/registry/instance_manager/aws.rb +10 -1
  2. data/lib/bosh/registry/version.rb +1 -1
  3. metadata +4 -4
data/lib/bosh/registry/instance_manager/aws.rb CHANGED
@@ -18,9 +18,18 @@ module Bosh::Registry
18
18
  :access_key_id => @aws_properties["access_key_id"],
19
19
  :secret_access_key => @aws_properties["secret_access_key"],
20
20
  :max_retries => @aws_properties["max_retries"] || AWS_MAX_RETRIES,
21
- :ec2_endpoint => "ec2.#{@aws_properties['region']}.amazonaws.com",
21
+ :ec2_endpoint => @aws_properties['ec2_endpoint'] || "ec2.#{@aws_properties['region']}.amazonaws.com",
22
22
  :logger => @logger
23
23
  }
24
+ # configure optional parameters
25
+ %w(
26
+ ssl_verify_peer
27
+ ssl_ca_file
28
+ ssl_ca_path
29
+ ).each do |k|
30
+ @aws_options[k.to_sym] = @aws_properties[k] unless @aws_properties[k].nil?
31
+ end
32
+
24
33
  @ec2 = AWS::EC2.new(@aws_options)
25
34
  end
26
35
 
data/lib/bosh/registry/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Registry
3
- VERSION = '1.2781.0'
3
+ VERSION = '1.2785.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-registry
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2781.0
4
+ version: 1.2785.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-12-05 00:00:00.000000000 Z
12
+ date: 2014-12-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sequel
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: 1.44.0
110
110
  description: ! 'BOSH Registry
111
111
 
112
- cc921b'
112
+ 30caeb'
113
113
  email: support@cloudfoundry.com
114
114
  executables:
115
115
  - bosh-registry
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
155
155
  version: '0'
156
156
  segments:
157
157
  - 0
158
- hash: -2224066705634273058
158
+ hash: 823776948681403533
159
159
  requirements: []
160
160
  rubyforge_project:
161
161
  rubygems_version: 1.8.23