bosh_agent 1.1750.0 → 1.1761.0

data/lib/bosh_agent/bootstrap.rb

@@ -36,24 +36,31 @@ module Bosh::Agent
       logger.info("Loaded settings: #{@settings.inspect}")
 
       if @settings
-        update_iptables
-        update_passwords
-        update_agent_id
-        update_credentials
-        update_hostname
-        update_mbus
-        update_blobstore
-        setup_networking
-        update_time
-        setup_data_disk
-        setup_data_sys
-        setup_tmp
-
-        Bosh::Agent::Monit.setup_monit_user
-        Bosh::Agent::Monit.setup_alerts
-
-        mount_persistent_disk
-        harden_permissions
+        if Config.configure
+          update_iptables
+          update_passwords
+          update_agent_id
+          update_credentials
+          update_hostname
+          update_mbus
+          update_blobstore
+          setup_networking
+          update_time
+          setup_data_disk
+          setup_data_sys
+          setup_tmp
+
+          Bosh::Agent::Monit.setup_monit_user
+          Bosh::Agent::Monit.setup_alerts
+
+          mount_persistent_disk
+          harden_permissions
+        else
+          update_agent_id
+          update_credentials
+          update_mbus
+          update_blobstore
+        end
       end
       { "settings" => @settings }
     end

data/lib/bosh_agent/infrastructure/dummy.rb

@@ -4,17 +4,7 @@ module Bosh::Agent
   class Infrastructure::Dummy
 
     def load_settings
-      {
-        "blobstore" => {
-          "provider" => Bosh::Agent::Config.blobstore_provider,
-          "options" => Bosh::Agent::Config.blobstore_options,
-        },
-        "ntp" => [],
-        "disks" => {
-          "persistent" => {},
-        },
-        "mbus" => Bosh::Agent::Config.mbus,
-      }
+      JSON.parse(File.read(Config.settings_file))
     end
 
     def get_network_settings(network_name, properties)

data/lib/bosh_agent/runner.rb

@@ -13,15 +13,13 @@ module Bosh::Agent
       $stdout.sync = true
       @logger.info("Starting agent #{VERSION}...")
 
-      if Config.configure
-        @logger.info('Configuring agent...')
-        Bootstrap.new.configure
+      @logger.info('Configuring agent...')
+      Bootstrap.new.configure
 
+      if Config.configure
         Monit.enable
         Monit.start
         Monit.start_services
-      else
-        @logger.info("Skipping configuration step (use '-c' argument to configure on start) ")
       end
 
       if Config.mbus.start_with?('https')

data/lib/bosh_agent/version.rb

@@ -2,7 +2,7 @@
 
 module Bosh
   module Agent
-    VERSION = '1.1750.0'
+    VERSION = '1.1761.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.1750.0
+  version: 1.1761.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.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.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.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.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.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.
 
-  5212a9'
+  826c69'
 email: support@cloudfoundry.com
 executables:
 - bosh_agent
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -830324863414353511
+      hash: 281882874783136665
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23