bosh_agent 1.2427.0 → 1.2446.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 (4) hide show
  1. data/lib/bosh_agent/platform/linux/disk.rb +1 -1
  2. data/lib/bosh_agent/platform/ubuntu/network.rb +16 -7
  3. data/lib/bosh_agent/version.rb +1 -1
  4. metadata +10 -10
data/lib/bosh_agent/platform/linux/disk.rb CHANGED
@@ -75,7 +75,7 @@ module Bosh::Agent
75
75
  private
76
76
 
77
77
  def rescan_scsi_bus
78
- sh "rescan-scsi-bus.sh"
78
+ sh "rescan-scsi-bus"
79
79
  end
80
80
 
81
81
  def get_dev_paths(dev_path)
data/lib/bosh_agent/platform/ubuntu/network.rb CHANGED
@@ -9,11 +9,11 @@ module Bosh::Agent
9
9
  end
10
10
 
11
11
  def write_network_interfaces
12
- template = ERB.new(load_erb("interfaces.erb"), 0, '%<>-')
12
+ template = ERB.new(load_erb('interfaces.erb'), 0, '%<>-')
13
13
  result = template.result(binding)
14
14
  network_updated = Bosh::Agent::Util::update_file(result, '/etc/network/interfaces')
15
15
  if network_updated
16
- @logger.info("Updated networking")
16
+ @logger.info('Updated networking')
17
17
  restart_networking_service
18
18
  end
19
19
  end
@@ -30,11 +30,20 @@ module Bosh::Agent
30
30
  end
31
31
 
32
32
  def write_dhcp_conf
33
- template = ERB.new(load_erb("dhclient_conf.erb"), 0, '%<>-')
33
+ template = ERB.new(load_erb('dhclient_conf.erb'), 0, '%<>-')
34
34
  result = template.result(binding)
35
- updated = Bosh::Agent::Util::update_file(result, '/etc/dhcp3/dhclient.conf')
35
+
36
+ updated = nil
37
+
38
+ if File.exists?('/etc/dhcp3/dhclient.conf')
39
+ # Ubuntu 10.04 dhclient config located in /etc/dhcp3
40
+ updated = Bosh::Agent::Util::update_file(result, '/etc/dhcp3/dhclient.conf')
41
+ else
42
+ updated = Bosh::Agent::Util::update_file(result, '/etc/dhcp/dhclient.conf')
43
+ end
44
+
36
45
  if updated
37
- @logger.info("Updated dhclient.conf")
46
+ @logger.info('Updated dhclient.conf')
38
47
  restart_dhclient
39
48
  end
40
49
  end
@@ -51,8 +60,8 @@ module Bosh::Agent
51
60
  # running (and dns changes will be flip floping each lease time). So
52
61
  # before restarting the network, we first kill all dhclient3 process.
53
62
  def restart_dhclient
54
- sh("pkill dhclient3", :on_error => :return)
55
- sh("/etc/init.d/networking restart", :on_error => :return)
63
+ sh('pkill dhclient', :on_error => :return)
64
+ sh('/etc/init.d/networking restart', :on_error => :return)
56
65
  end
57
66
 
58
67
  end
data/lib/bosh_agent/version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Bosh
4
4
  module Agent
5
- VERSION = '1.2427.0'
5
+ VERSION = '1.2446.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.2427.0
4
+ version: 1.2446.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-04-18 00:00:00.000000000 Z
12
+ date: 2014-04-21 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.2427.0
165
+ version: 1.2446.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.2427.0
173
+ version: 1.2446.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.2427.0
181
+ version: 1.2446.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.2427.0
189
+ version: 1.2446.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.2427.0
197
+ version: 1.2446.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.2427.0
205
+ version: 1.2446.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
- 921db9'
241
+ 6c4e15'
242
242
  email: support@cloudfoundry.com
243
243
  executables:
244
244
  - bosh_agent
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
344
344
  version: '0'
345
345
  segments:
346
346
  - 0
347
- hash: 534985211319468583
347
+ hash: 3697338253089304881
348
348
  requirements: []
349
349
  rubyforge_project:
350
350
  rubygems_version: 1.8.23