bosh_cli_plugin_aws 1.1868.0 → 1.1975.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/bosh_cli_plugin_aws/bat_manifest.rb +12 -0
  2. data/lib/bosh_cli_plugin_aws/version.rb +1 -1
  3. data/templates/bat.yml.erb +4 -4
  4. metadata +12 -12
data/lib/bosh_cli_plugin_aws/bat_manifest.rb CHANGED
@@ -35,6 +35,18 @@ module Bosh
35
35
  def get_template(template)
36
36
  File.expand_path("../../../templates/#{template}", __FILE__)
37
37
  end
38
+
39
+ private
40
+
41
+ def reserved_ip_range
42
+ env_range = ENV.fetch('BOSH_AWS_NETWORK_RESERVED', '')
43
+ env_range.empty? ? '10.10.0.2 - 10.10.0.9' : env_range
44
+ end
45
+
46
+ def static_ip_range
47
+ env_range = ENV.fetch('BOSH_AWS_NETWORK_STATIC', '')
48
+ env_range.empty? ? '10.10.0.10 - 10.10.0.30' : env_range
49
+ end
38
50
  end
39
51
  end
40
52
  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.1868.0'
3
+ VERSION = '1.1975.0'
4
4
  end
5
5
  end
data/templates/bat.yml.erb CHANGED
@@ -40,9 +40,9 @@ networks:
40
40
  subnets:
41
41
  - range: 10.10.0.0/24
42
42
  reserved:
43
- - 10.10.0.2 - 10.10.0.9
43
+ - <%= reserved_ip_range %>
44
44
  static:
45
- - 10.10.0.10 - 10.10.0.30
45
+ - <%= static_ip_range %>
46
46
  gateway: 10.10.0.1
47
47
  security_groups:
48
48
  - bat
@@ -72,9 +72,9 @@ properties:
72
72
  network:
73
73
  cidr: 10.10.0.0/24
74
74
  reserved:
75
- - 10.10.0.2 - 10.10.0.9
75
+ - <%= reserved_ip_range %>
76
76
  static:
77
- - 10.10.0.10 - 10.10.0.30
77
+ - <%= static_ip_range %>
78
78
  gateway: 10.10.0.1
79
79
  subnet: <%= subnet %>
80
80
  security_groups:
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli_plugin_aws
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1868.0
4
+ version: 1.1975.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-01-29 00:00:00.000000000 Z
12
+ date: 2014-02-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bosh_cli
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 1.1868.0
21
+ version: 1.1975.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ~>
28
28
  - !ruby/object:Gem::Version
29
- version: 1.1868.0
29
+ version: 1.1975.0
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: bosh_aws_cpi
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.1868.0
37
+ version: 1.1975.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.1868.0
45
+ version: 1.1975.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh_cli_plugin_micro
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.1868.0
53
+ version: 1.1975.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.1868.0
61
+ version: 1.1975.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-stemcell
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.1868.0
69
+ version: 1.1975.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.1868.0
77
+ version: 1.1975.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: rspec
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '0'
110
110
  description: ! 'BOSH plugin to easily create and delete an AWS VPC
111
111
 
112
- f69423'
112
+ 9c66c4'
113
113
  email: support@cloudfoundry.com
114
114
  executables: []
115
115
  extensions: []
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
175
175
  version: '0'
176
176
  segments:
177
177
  - 0
178
- hash: 2274718263976788474
178
+ hash: -3195980926158254707
179
179
  requirements: []
180
180
  rubyforge_project:
181
181
  rubygems_version: 1.8.23