bosh_cli_plugin_aws 1.1798.0 → 1.1836.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_cli_plugin_aws/bosh_bootstrap.rb +10 -10
  2. data/lib/bosh_cli_plugin_aws/version.rb +1 -1
  3. metadata +12 -12
data/lib/bosh_cli_plugin_aws/bosh_bootstrap.rb CHANGED
@@ -2,8 +2,7 @@ require_relative 'bootstrap'
2
2
  require 'net/https'
3
3
  require 'bosh/stemcell/archive'
4
4
  require 'bosh/stemcell/archive_filename'
5
- require 'bosh/stemcell/infrastructure'
6
- require 'bosh/stemcell/operating_system'
5
+ require 'bosh/stemcell/definition'
7
6
 
8
7
  module Bosh
9
8
  module Aws
@@ -17,6 +16,7 @@ module Bosh
17
16
  self.options[:non_interactive] = true
18
17
  self.director = director
19
18
  self.s3 = s3
19
+ @env = ENV.to_hash
20
20
  end
21
21
 
22
22
  def validate_requirements
@@ -53,6 +53,8 @@ This command should be used for bootstrapping bosh from scratch.
53
53
 
54
54
  private
55
55
 
56
+ attr_reader :env
57
+
56
58
  def manifest
57
59
  unless @manifest
58
60
  vpc_receipt_filename = File.expand_path('aws_vpc_receipt.yml')
@@ -109,7 +111,7 @@ This command should be used for bootstrapping bosh from scratch.
109
111
 
110
112
  def fetch_and_upload_stemcell
111
113
  stemcell_command = Bosh::Cli::Command::Stemcell.new
112
- stemcell_command.options = self.options
114
+ stemcell_command.options = options
113
115
  stemcell_path = bosh_stemcell
114
116
  stemcell_command.upload(stemcell_path)
115
117
  stemcell_path
@@ -127,9 +129,8 @@ This command should be used for bootstrapping bosh from scratch.
127
129
  end
128
130
 
129
131
  def latest_aws_ubuntu_bosh_stemcell_filename
130
- infrastructure = Bosh::Stemcell::Infrastructure.for('aws')
131
- operating_system = Bosh::Stemcell::OperatingSystem.for('ubuntu')
132
- Bosh::Stemcell::ArchiveFilename.new('latest', infrastructure, operating_system, 'bosh-stemcell', true)
132
+ definition = Bosh::Stemcell::Definition.for('aws', 'ubuntu', 'ruby')
133
+ Bosh::Stemcell::ArchiveFilename.new('latest', definition, 'bosh-stemcell', true)
133
134
  end
134
135
 
135
136
  def bosh_release
@@ -141,16 +142,15 @@ This command should be used for bootstrapping bosh from scratch.
141
142
  end
142
143
 
143
144
  def bosh_stemcell_override
144
- ENV['BOSH_OVERRIDE_LIGHT_STEMCELL_URL']
145
+ env['BOSH_OVERRIDE_LIGHT_STEMCELL_URL']
145
146
  end
146
147
 
147
148
  def bosh_release_override
148
- ENV['BOSH_OVERRIDE_RELEASE_TGZ']
149
+ env['BOSH_OVERRIDE_RELEASE_TGZ']
149
150
  end
150
151
 
151
152
  def bosh_version
152
- ENV['BOSH_VERSION_OVERRIDE'] ||
153
- Bosh::Aws::VERSION.split('.')[1]
153
+ env['BOSH_VERSION_OVERRIDE'] || Bosh::Aws::VERSION.split('.')[1]
154
154
  end
155
155
  end
156
156
  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.1798.0'
3
+ VERSION = '1.1836.0'
4
4
  end
5
5
  end
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.1798.0
4
+ version: 1.1836.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-18 00:00:00.000000000 Z
12
+ date: 2014-01-23 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.1798.0
21
+ version: 1.1836.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.1798.0
29
+ version: 1.1836.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.1798.0
37
+ version: 1.1836.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.1798.0
45
+ version: 1.1836.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.1798.0
53
+ version: 1.1836.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.1798.0
61
+ version: 1.1836.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.1798.0
69
+ version: 1.1836.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.1798.0
77
+ version: 1.1836.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
- 4c516b'
112
+ f49b5d'
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: -2344933530944399406
178
+ hash: 3841580927099894369
179
179
  requirements: []
180
180
  rubyforge_project:
181
181
  rubygems_version: 1.8.23