bosh_agent 1.2427.0 → 1.2446.0

data/lib/bosh_agent/platform/linux/disk.rb

@@ -75,7 +75,7 @@ module Bosh::Agent
     private
 
     def rescan_scsi_bus
-      sh "rescan-scsi-bus.sh"
+      sh "rescan-scsi-bus"
     end
 
     def get_dev_paths(dev_path)

data/lib/bosh_agent/platform/ubuntu/network.rb

@@ -9,11 +9,11 @@ module Bosh::Agent
     end
 
     def write_network_interfaces
-      template = ERB.new(load_erb("interfaces.erb"), 0, '%<>-')
+      template = ERB.new(load_erb('interfaces.erb'), 0, '%<>-')
       result = template.result(binding)
       network_updated = Bosh::Agent::Util::update_file(result, '/etc/network/interfaces')
       if network_updated
-        @logger.info("Updated networking")
+        @logger.info('Updated networking')
         restart_networking_service
       end
     end
@@ -30,11 +30,20 @@ module Bosh::Agent
     end
 
     def write_dhcp_conf
-      template = ERB.new(load_erb("dhclient_conf.erb"), 0, '%<>-')
+      template = ERB.new(load_erb('dhclient_conf.erb'), 0, '%<>-')
       result = template.result(binding)
-      updated = Bosh::Agent::Util::update_file(result, '/etc/dhcp3/dhclient.conf')
+
+      updated = nil
+
+      if File.exists?('/etc/dhcp3/dhclient.conf')
+        # Ubuntu 10.04 dhclient config located in /etc/dhcp3
+        updated = Bosh::Agent::Util::update_file(result, '/etc/dhcp3/dhclient.conf')
+      else
+        updated = Bosh::Agent::Util::update_file(result, '/etc/dhcp/dhclient.conf')
+      end
+
       if updated
-        @logger.info("Updated dhclient.conf")
+        @logger.info('Updated dhclient.conf')
         restart_dhclient
       end
     end
@@ -51,8 +60,8 @@ module Bosh::Agent
     # running (and dns changes will be flip floping each lease time). So
     # before restarting the network, we first kill all dhclient3 process.
     def restart_dhclient
-      sh("pkill dhclient3", :on_error => :return)
-      sh("/etc/init.d/networking restart", :on_error => :return)
+      sh('pkill dhclient', :on_error => :return)
+      sh('/etc/init.d/networking restart', :on_error => :return)
     end
 
   end

data/lib/bosh_agent/version.rb

@@ -2,7 +2,7 @@
 
 module Bosh
   module Agent
-    VERSION = '1.2427.0'
+    VERSION = '1.2446.0'
     BOSH_PROTOCOL = "1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_agent
 version: !ruby/object:Gem::Version
-  version: 1.2427.0
+  version: 1.2446.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ dependencies:
 description: ! 'This agent listens for instructions from the bosh director on each
   server that bosh manages.
 
-  921db9'
+  6c4e15'
 email: support@cloudfoundry.com
 executables:
 - bosh_agent
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 534985211319468583
+      hash: 3697338253089304881
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23