bosh_aws_cpi 1.2005.0 → 1.2063.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 +9 -4
  2. data/lib/cloud/aws/version.rb +1 -1
  3. metadata +10 -10
data/lib/cloud/aws/instance_manager.rb CHANGED
@@ -64,10 +64,15 @@ module Bosh::AwsCloud
64
64
 
65
65
  remove_from_load_balancers
66
66
 
67
- instance.terminate
68
-
69
- @logger.info("Deleting instance settings for '#{instance.id}'")
70
- @registry.delete_settings(instance.id)
67
+ begin
68
+ instance.terminate
69
+ rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
70
+ @logger.info("Failed to terminate instance because it was not found: #{e.inspect}")
71
+ raise Bosh::Clouds::VMNotFound, "VM `#{instance_id}' not found"
72
+ ensure
73
+ @logger.info("Deleting instance settings for '#{instance_id}'")
74
+ @registry.delete_settings(instance_id)
75
+ end
71
76
 
72
77
  if fast
73
78
  TagManager.tag(instance, "Name", "to be deleted")
data/lib/cloud/aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module AwsCloud
3
- VERSION = '1.2005.0'
3
+ VERSION = '1.2063.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.2005.0
4
+ version: 1.2063.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-02-16 00:00:00.000000000 Z
12
+ date: 2014-02-25 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.2005.0
37
+ version: 1.2063.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.2005.0
45
+ version: 1.2063.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.2005.0
53
+ version: 1.2063.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.2005.0
61
+ version: 1.2063.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.2005.0
69
+ version: 1.2063.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.2005.0
77
+ version: 1.2063.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
- f36cae'
112
+ 941741'
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: -3679165088611503630
162
+ hash: 825767351219660752
163
163
  requirements: []
164
164
  rubyforge_project:
165
165
  rubygems_version: 1.8.23