bosh_aws_cpi 1.2975.0 → 1.2976.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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cloud/aws/cloud.rb +5 -2
  3. data/lib/cloud/aws/instance.rb +1 -1
  4. data/lib/cloud/aws/version.rb +1 -1
  5. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 27920c7a1d5f41822c62323aef01a46c5e96a988
4
- data.tar.gz: 3d834910c5b2187156ecbffa4b544213ae371d85
3
+ metadata.gz: d013e68c9bf6753e9ff8dde559cef6bb0a20094d
4
+ data.tar.gz: c012075d45255ab158bb8c1c67afb2aa98723e29
5
5
  SHA512:
6
- metadata.gz: 5f2d2d7f548c8d9910e960033c65a99ff37ae906d054a0fd64fe13ee34f70e7216798b52a1c452100ba3dafccc33736f6a169c93b01eb42edd224c722dfac3cb
7
- data.tar.gz: 7b3653126dec05e54b8885c73eb4af31f4fc0d8f6aec4b37d4fff35c83ed95ae48ea6487b8d16da31b2cdafcb2460016dd47f79c430b051cad253cdc491c4471
6
+ metadata.gz: 67c57423d4c93a8d3d7ad9bed630d36cc61256ac714000db25ef1fb22438220a4152a7a083acdfbd8df9f84c292c9cf967744acd6743fa413b65aae41e362d7c
7
+ data.tar.gz: 4e299dc0ded47c21cdbb0915941e2d8558e6b11cdc1edd6d914ac3db657602ae9802a443a9307b39f3650ce3a123b991fa439cc1788245cd2b8fdae10c3b3f66
data/lib/cloud/aws/cloud.rb CHANGED
@@ -254,7 +254,7 @@ module Bosh::AwsCloud
254
254
  volume.delete
255
255
  rescue AWS::EC2::Errors::InvalidVolume::NotFound => e
256
256
  logger.warn("Failed to delete disk '#{disk_id}' because it was not found: #{e.inspect}")
257
- raise Bosh::Clouds::DiskNotFound, "Disk '#{disk_id}' not found"
257
+ raise Bosh::Clouds::DiskNotFound.new(false), "Disk '#{disk_id}' not found"
258
258
  end
259
259
 
260
260
  true # return true to only retry on Exceptions
@@ -554,7 +554,10 @@ module Bosh::AwsCloud
554
554
 
555
555
  def initialize_aws
556
556
  @ec2 = AWS::EC2.new(@aws_params)
557
- @region = @ec2.regions[aws_region]
557
+ # @ec2.regions[] does not properly set the endpoint on the region (bug in /aws/ec2/region_collection.rb)
558
+ # It just returns a Region object with nothing set but the name.
559
+ # As a workaround use the 'each' method, which is implemented correctly
560
+ @region = @ec2.regions.select {|r| r.name == aws_region}.first
558
561
  @az_selector = AvailabilityZoneSelector.new(@region, aws_properties['default_availability_zone'])
559
562
  end
560
563
 
data/lib/cloud/aws/instance.rb CHANGED
@@ -96,7 +96,7 @@ module Bosh::AwsCloud
96
96
  load_balancer.instances.deregister(@aws_instance)
97
97
  true
98
98
  end
99
- rescue AWS::ELB::Errors::InvalidInstance
99
+ rescue AWS::ELB::Errors::InvalidInstance, AWS::Errors::Base
100
100
  # ignore this, as it just means it wasn't registered
101
101
  end
102
102
  end
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2975.0'
3
+ VERSION = '1.2976.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.2975.0
4
+ version: 1.2976.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-05-18 00:00:00.000000000 Z
11
+ date: 2015-05-20 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.2975.0
33
+ version: 1.2976.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.2975.0
40
+ version: 1.2976.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.2975.0
47
+ version: 1.2976.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.2975.0
54
+ version: 1.2976.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.2975.0
61
+ version: 1.2976.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.2975.0
68
+ version: 1.2976.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
- a143e0
141
+ 3e4157
142
142
  email: support@cloudfoundry.com
143
143
  executables:
144
144
  - aws_cpi