bosh_agent 1.1750.0 → 1.1761.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. data/lib/bosh_agent/bootstrap.rb +25 -18
  2. data/lib/bosh_agent/infrastructure/dummy.rb +1 -11
  3. data/lib/bosh_agent/runner.rb +3 -5
  4. data/lib/bosh_agent/version.rb +1 -1
  5. metadata +10 -10
data/lib/bosh_agent/bootstrap.rb CHANGED
@@ -36,24 +36,31 @@ module Bosh::Agent
36
36
  logger.info("Loaded settings: #{@settings.inspect}")
37
37
 
38
38
  if @settings
39
- update_iptables
40
- update_passwords
41
- update_agent_id
42
- update_credentials
43
- update_hostname
44
- update_mbus
45
- update_blobstore
46
- setup_networking
47
- update_time
48
- setup_data_disk
49
- setup_data_sys
50
- setup_tmp
51
-
52
- Bosh::Agent::Monit.setup_monit_user
53
- Bosh::Agent::Monit.setup_alerts
54
-
55
- mount_persistent_disk
56
- harden_permissions
39
+ if Config.configure
40
+ update_iptables
41
+ update_passwords
42
+ update_agent_id
43
+ update_credentials
44
+ update_hostname
45
+ update_mbus
46
+ update_blobstore
47
+ setup_networking
48
+ update_time
49
+ setup_data_disk
50
+ setup_data_sys
51
+ setup_tmp
52
+
53
+ Bosh::Agent::Monit.setup_monit_user
54
+ Bosh::Agent::Monit.setup_alerts
55
+
56
+ mount_persistent_disk
57
+ harden_permissions
58
+ else
59
+ update_agent_id
60
+ update_credentials
61
+ update_mbus
62
+ update_blobstore
63
+ end
57
64
  end
58
65
  { "settings" => @settings }
59
66
  end
data/lib/bosh_agent/infrastructure/dummy.rb CHANGED
@@ -4,17 +4,7 @@ module Bosh::Agent
4
4
  class Infrastructure::Dummy
5
5
 
6
6
  def load_settings
7
- {
8
- "blobstore" => {
9
- "provider" => Bosh::Agent::Config.blobstore_provider,
10
- "options" => Bosh::Agent::Config.blobstore_options,
11
- },
12
- "ntp" => [],
13
- "disks" => {
14
- "persistent" => {},
15
- },
16
- "mbus" => Bosh::Agent::Config.mbus,
17
- }
7
+ JSON.parse(File.read(Config.settings_file))
18
8
  end
19
9
 
20
10
  def get_network_settings(network_name, properties)
data/lib/bosh_agent/runner.rb CHANGED
@@ -13,15 +13,13 @@ module Bosh::Agent
13
13
  $stdout.sync = true
14
14
  @logger.info("Starting agent #{VERSION}...")
15
15
 
16
- if Config.configure
17
- @logger.info('Configuring agent...')
18
- Bootstrap.new.configure
16
+ @logger.info('Configuring agent...')
17
+ Bootstrap.new.configure
19
18
 
19
+ if Config.configure
20
20
  Monit.enable
21
21
  Monit.start
22
22
  Monit.start_services
23
- else
24
- @logger.info("Skipping configuration step (use '-c' argument to configure on start) ")
25
23
  end
26
24
 
27
25
  if Config.mbus.start_with?('https')
data/lib/bosh_agent/version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Bosh
4
4
  module Agent
5
- VERSION = '1.1750.0'
5
+ VERSION = '1.1761.0'
6
6
  BOSH_PROTOCOL = "1"
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_agent
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1750.0
4
+ version: 1.1761.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-08 00:00:00.000000000 Z
12
+ date: 2014-01-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: netaddr
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - ~>
164
164
  - !ruby/object:Gem::Version
165
- version: 1.1750.0
165
+ version: 1.1761.0
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
170
170
  requirements:
171
171
  - - ~>
172
172
  - !ruby/object:Gem::Version
173
- version: 1.1750.0
173
+ version: 1.1761.0
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: bosh_common
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
178
178
  requirements:
179
179
  - - ~>
180
180
  - !ruby/object:Gem::Version
181
- version: 1.1750.0
181
+ version: 1.1761.0
182
182
  type: :runtime
183
183
  prerelease: false
184
184
  version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
186
186
  requirements:
187
187
  - - ~>
188
188
  - !ruby/object:Gem::Version
189
- version: 1.1750.0
189
+ version: 1.1761.0
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: blobstore_client
192
192
  requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
194
194
  requirements:
195
195
  - - ~>
196
196
  - !ruby/object:Gem::Version
197
- version: 1.1750.0
197
+ version: 1.1761.0
198
198
  type: :runtime
199
199
  prerelease: false
200
200
  version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
202
202
  requirements:
203
203
  - - ~>
204
204
  - !ruby/object:Gem::Version
205
- version: 1.1750.0
205
+ version: 1.1761.0
206
206
  - !ruby/object:Gem::Dependency
207
207
  name: rspec
208
208
  requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ dependencies:
238
238
  description: ! 'This agent listens for instructions from the bosh director on each
239
239
  server that bosh manages.
240
240
 
241
- 5212a9'
241
+ 826c69'
242
242
  email: support@cloudfoundry.com
243
243
  executables:
244
244
  - bosh_agent
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
342
342
  version: '0'
343
343
  segments:
344
344
  - 0
345
- hash: -830324863414353511
345
+ hash: 281882874783136665
346
346
  requirements: []
347
347
  rubyforge_project:
348
348
  rubygems_version: 1.8.23