bosh_cli_plugin_aws 1.2641.0 → 1.2652.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh_cli_plugin_aws/ec2.rb +10 -1
  3. data/lib/bosh_cli_plugin_aws/version.rb +1 -1
  4. data/lib/bosh_cli_plugin_aws/vpc.rb +9 -1
  5. metadata +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4b19ca0eb92be803be13b468615be9ab8b8fb8f7
4
- data.tar.gz: f34e3031df4fd581b8bc4d7fa7324847e2f05bc3
3
+ metadata.gz: 0951eddf799b9690d664b844ad040c18d09f278d
4
+ data.tar.gz: ad1338d63998457afbbd596c7403a56968840733
5
5
  SHA512:
6
- metadata.gz: 87348f7587680d412a9492c0102e3f489ca4ec51dc6810f10ba4c71adcf44f9260aa6f75291b5dd91e488b6c9e7c0ab4444f8f1c5f037a53e5a148c9b5c1c7af
7
- data.tar.gz: aa20eee6843ea0388116734a186f019c002da28779d41749e75061b5da49214ef798acc534324f837a0f2d438eb6d48f73f4687bb8333f5df0dc94952ac39543
6
+ metadata.gz: d2fb5d6a75bb6e0f06809fc73c46b2d21c1e53be7728f80ea85bcd1c54a73fb6994a53c81fb672af3935c0bff12bf71de6940a79b1b7b50d44d88da889088ebc
7
+ data.tar.gz: ee8451060a8fd26cececa13960de4a800698d59918a9d266d40f61491ec1750f926ede8cd427f57b5945f5b183a0e0104c789a0d383b8c93622d972e98c59dc9
data/lib/bosh_cli_plugin_aws/ec2.rb CHANGED
@@ -87,12 +87,21 @@ module Bosh
87
87
 
88
88
  create_instance(instance_options).tap do |instance|
89
89
  Bosh::AwsCloud::ResourceWait.for_instance(instance: instance, state: :running)
90
+
90
91
  instance.add_tag("Name", {value: name})
92
+
91
93
  elastic_ip = allocate_elastic_ip
92
- Bosh::Common.retryable(tries: 30, on: AWS::EC2::Errors::InvalidAddress::NotFound) do
94
+
95
+ ignorable_errors = [
96
+ AWS::EC2::Errors::InvalidAddress::NotFound,
97
+ AWS::EC2::Errors::InvalidAllocationID::NotFound,
98
+ ]
99
+
100
+ Bosh::Common.retryable(tries: 30, on: ignorable_errors) do
93
101
  instance.associate_elastic_ip(elastic_ip)
94
102
  true
95
103
  end
104
+
96
105
  disable_src_dest_checking(instance.id)
97
106
  end
98
107
  end
data/lib/bosh_cli_plugin_aws/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Aws
3
- VERSION = '1.2641.0'
3
+ VERSION = '1.2652.0'
4
4
  end
5
5
  end
data/lib/bosh_cli_plugin_aws/vpc.rb CHANGED
@@ -78,10 +78,18 @@ module Bosh
78
78
  if group_name_available group_spec["name"]
79
79
  security_group = @aws_vpc.security_groups.create(group_spec["name"])
80
80
  Bosh::AwsCloud::ResourceWait.for_sgroup(sgroup: security_group, state: true)
81
+
81
82
  group_spec["ingress"].each do |ingress|
82
83
  range_match = ingress["ports"].to_s.match(/(\d+)\s*-\s*(\d+)/)
83
84
  ports = range_match ? (range_match[1].to_i)..(range_match[2].to_i) : ingress["ports"].to_i
84
- security_group.authorize_ingress(ingress["protocol"], ports, ingress["sources"])
85
+
86
+ # Wait for eventual consistancy
87
+ ignorable_errors = [AWS::EC2::Errors::InvalidGroup::NotFound]
88
+
89
+ Bosh::Common.retryable(tries: 30, on: ignorable_errors) do
90
+ security_group.authorize_ingress(ingress["protocol"], ports, ingress["sources"])
91
+ true
92
+ end
85
93
  end
86
94
  end
87
95
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli_plugin_aws
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2641.0
4
+ version: 1.2652.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-07-11 00:00:00.000000000 Z
11
+ date: 2014-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_cli
@@ -16,59 +16,59 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.2641.0
19
+ version: 1.2652.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.2641.0
26
+ version: 1.2652.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh_aws_cpi
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2641.0
33
+ version: 1.2652.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.2641.0
40
+ version: 1.2652.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh_cli_plugin_micro
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2641.0
47
+ version: 1.2652.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.2641.0
54
+ version: 1.2652.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-stemcell
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2641.0
61
+ version: 1.2652.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.2641.0
68
+ version: 1.2652.0
69
69
  description: |-
70
70
  BOSH plugin to easily create and delete an AWS VPC
71
- 23fe6f
71
+ 43d2e8
72
72
  email: support@cloudfoundry.com
73
73
  executables: []
74
74
  extensions: []