bosh-director 1.2611.0 → 1.2619.0

data/bin/bosh-director-worker

@@ -52,10 +52,9 @@ end
 Bosh::Director::App.new(config)
 
 resque_logging = config.hash.fetch('resque', {}).fetch('logging', {})
-resque_log_device = Logger::LogDevice.new(resque_logging.fetch('file', STDOUT))
 resque_logger_level = resque_logging.fetch('level', 'info').upcase
-Resque.logger = Logger.new(resque_log_device)
-Resque.logger.level = Logger.const_get(resque_logger_level)
+Resque.logger = MonoLogger.new(resque_logging.fetch('file', STDOUT))
+Resque.logger.level = MonoLogger.const_get(resque_logger_level)
 
 worker = nil
 queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')

data/lib/bosh/director.rb

@@ -11,6 +11,7 @@ require 'fileutils'
 require 'forwardable'
 require 'logger'
 require 'monitor'
+require 'mono_logger'
 require 'optparse'
 require 'ostruct'
 require 'pathname'

data/lib/bosh/director/api/task_helper.rb

@@ -15,7 +15,7 @@ module Bosh::Director
         log_dir = File.join(Config.base_dir, "tasks", task.id.to_s)
         task_status_file = File.join(log_dir, "debug")
         FileUtils.mkdir_p(log_dir)
-        logger = Logger.new(task_status_file)
+        logger = MonoLogger.new(task_status_file)
         logger.level = Config.logger.level
         logger.info("Director Version : #{Bosh::Director::VERSION}")
         logger.info("Enqueuing task: #{task.id}")

data/lib/bosh/director/config.rb

@@ -73,16 +73,16 @@ module Bosh::Director
         @task_checkpoint_interval = 30
 
         logging = config.fetch('logging', {})
-        @log_device = Logger::LogDevice.new(logging.fetch('file', STDOUT))
-        @logger = Logger.new(@log_device)
-        @logger.level = Logger.const_get(logging.fetch('level', 'debug').upcase)
+        @log_device = MonoLogger::LocklessLogDevice.new(logging.fetch('file', STDOUT))
+        @logger = MonoLogger.new(@log_device)
+        @logger.level = MonoLogger.const_get(logging.fetch('level', 'debug').upcase)
         @logger.formatter = ThreadFormatter.new
 
         # use a separate logger for redis to make it stfu
-        redis_logger = Logger.new(@log_device)
+        redis_logger = MonoLogger.new(@log_device)
         logging = config.fetch('redis', {}).fetch('logging', {})
         redis_logger_level = logging.fetch('level', 'info').upcase
-        redis_logger.level = Logger.const_get(redis_logger_level)
+        redis_logger.level = MonoLogger.const_get(redis_logger_level)
 
         # Event logger supposed to be overridden per task,
         # the default one does nothing

data/lib/bosh/director/deployment_plan/assembler.rb

@@ -51,24 +51,24 @@ module Bosh::Director
     def bind_existing_vm(vm, lock)
       state = get_state(vm)
       lock.synchronize do
-        @logger.debug('Processing network reservations')
+        @logger.debug('Processing VM network reservations')
         reservations = get_network_reservations(state)
 
         instance = vm.instance
         if instance
           bind_instance(instance, state, reservations)
         else
-          @logger.debug('Binding resource pool VM')
-          resource_pool = @deployment_plan.resource_pool(
-              state['resource_pool']['name'])
+          resource_pool_name = state['resource_pool']['name']
+          resource_pool = @deployment_plan.resource_pool(resource_pool_name)
           if resource_pool
+            @logger.debug("Binding VM to resource pool '#{resource_pool_name}'")
             bind_idle_vm(vm, resource_pool, state, reservations)
           else
-            @logger.debug("Resource pool doesn't exist, marking for deletion")
+            @logger.debug("Resource pool '#{resource_pool_name}' does not exist, marking VM for deletion")
             @deployment_plan.delete_vm(vm)
           end
         end
-        @logger.debug('Finished binding VM')
+        @logger.debug('Finished processing VM network reservations')
       end
     end
 
@@ -78,20 +78,29 @@ module Bosh::Director
     # @param [Hash] state VM state according to its agent
     # @param [Hash] reservations Network reservations
     def bind_idle_vm(vm, resource_pool, state, reservations)
-      @logger.debug('Adding to resource pool')
+      if reservations.any? { |network_name, reservation| reservation.static? }
+        @logger.debug("Releasing all network reservations for VM `#{vm.cid}'")
+        reservations.each do |network_name, reservation|
+          @logger.debug("Releasing #{reservation.type} network reservation `#{network_name}' for VM `#{vm.cid}'")
+          resource_pool.network.release(reservation)
+        end
+
+        @logger.debug("Deleting VM `#{vm.cid}' with static network reservation")
+        @deployment_plan.delete_vm(vm)
+        return
+      end
+
+      @logger.debug("Adding VM `#{vm.cid}' to resource pool `#{resource_pool.name}'")
       idle_vm = resource_pool.add_idle_vm
       idle_vm.vm = vm
       idle_vm.current_state = state
 
-      reservation = reservations[resource_pool.network.name]
+      network_name = resource_pool.network.name
+      reservation = reservations[network_name]
       if reservation
-        if reservation.static?
-          @logger.debug('Releasing static network reservation for ' +
-                        "resource pool VM `#{vm.cid}'")
-          resource_pool.network.release(reservation)
-        else
-          idle_vm.use_reservation(reservation)
-        end
+        @logger.debug("Using existing `#{reservation.type}' " +
+          "network reservation of `#{reservation.ip}' for VM `#{vm.cid}'")
+        idle_vm.use_reservation(reservation)
       else
         @logger.debug("No network reservation for VM `#{vm.cid}'")
       end
@@ -118,26 +127,26 @@ module Bosh::Director
 
       job = @deployment_plan.job(instance_model.job)
       unless job
-        @logger.debug("Job '#{instance_model.job}' not found, marking for deletion")
+        @logger.debug("Job `#{instance_model.job}' not found, marking for deletion")
         @deployment_plan.delete_instance(instance_model)
         return
       end
 
       instance = job.instance(instance_model.index)
       unless instance
-        @logger.debug("Job instance #{instance_name} not found, marking for deletion")
+        @logger.debug("Job instance `#{instance_name}' not found, marking for deletion")
         @deployment_plan.delete_instance(instance_model)
         return
       end
 
-      @logger.debug("Found job instance #{instance_name}")
+      @logger.debug("Found job instance `#{instance_name}'")
       instance.use_model(instance_model)
       instance.current_state = state
 
-      @logger.debug("Copying job instance #{instance_name} network reservations")
+      @logger.debug("Copying job instance `#{instance_name}' network reservations")
       instance.take_network_reservations(reservations)
 
-      @logger.debug("Copying job instance #{instance_name} resource pool reservation")
+      @logger.debug("Copying job instance `#{instance_name}' resource pool reservation")
       job.resource_pool.mark_active_vm
     end
 

data/lib/bosh/director/deployment_plan/deployment_spec_parser.rb

@@ -6,8 +6,9 @@ module Bosh::Director
       include DnsHelper
       include ValidationHelper
 
-      def initialize(event_log)
+      def initialize(event_log, logger)
         @event_log = event_log
+        @logger = logger
       end
 
       # @param [Hash] manifest Raw deployment manifest
@@ -102,7 +103,7 @@ module Bosh::Director
       def parse_resource_pools
         resource_pools = safe_property(@manifest, 'resource_pools', :class => Array)
         resource_pools.each do |rp_spec|
-          @deployment.add_resource_pool(ResourcePool.new(@deployment, rp_spec))
+          @deployment.add_resource_pool(ResourcePool.new(@deployment, rp_spec, @logger))
         end
 
         # Uncomment when integration test fixed

data/lib/bosh/director/deployment_plan/planner.rb

@@ -31,8 +31,12 @@ module Bosh::Director
       #   All jobs in the deployment
       attr_reader :jobs
 
+      # Job instances from the old manifest that are not in the new manifest
       attr_accessor :unneeded_instances
+
+      # VMs from the old manifest that are not in the new manifest
       attr_accessor :unneeded_vms
+
       attr_accessor :dns_domain
 
       attr_reader :job_rename
@@ -41,13 +45,15 @@ module Bosh::Director
       attr_reader :recreate
 
       # @param [Hash] manifest Raw deployment manifest
-      # @param [Bosh::Director::EventLog::Log]
-      #   event_log Event log for recording deprecations
       # @param [Hash] options Additional options for deployment
       #   (e.g. job_states, job_rename)
+      # @param [Bosh::Director::EventLog::Log]
+      #   event_log Event log for recording deprecations
+      # @param [Logger]
+      #   logger Log for director logging
       # @return [Bosh::Director::DeploymentPlan::Planner]
-      def self.parse(manifest, event_log, options)
-        parser = DeploymentSpecParser.new(event_log)
+      def self.parse(manifest, options, event_log, logger)
+        parser = DeploymentSpecParser.new(event_log, logger)
         parser.parse(manifest, options)
       end
 

data/lib/bosh/director/deployment_plan/resource_pool.rb

@@ -40,11 +40,14 @@ module Bosh::Director
 
       # @param [DeploymentPlan] deployment_plan Deployment plan
       # @param [Hash] spec Raw resource pool spec from the deployment manifest
-      def initialize(deployment_plan, spec)
+      # @param [Logger] logger Director logger
+      def initialize(deployment_plan, spec, logger)
         @deployment_plan = deployment_plan
 
+        @logger = logger
+
         @name = safe_property(spec, "name", :class => String)
-        @size = safe_property(spec, "size", :class => Integer)
+        @size = safe_property(spec, "size", :class => Integer, :optional => true)
 
         @cloud_properties =
           safe_property(spec, "cloud_properties", :class => Hash)
@@ -112,6 +115,14 @@ module Bosh::Director
       end
 
       def allocate_vm
+        if @idle_vms.empty?
+          if dynamically_sized?
+            add_idle_vm
+          else
+            raise ResourcePoolNotEnoughCapacity,
+                  "Resource pool `#{@name}' has no more VMs to allocate"
+          end
+        end
         allocated_vm = @idle_vms.pop
         @allocated_vms << allocated_vm
         allocated_vm
@@ -119,9 +130,16 @@ module Bosh::Director
 
       def deallocate_vm(idle_vm_cid)
         deallocated_vm = @allocated_vms.find { |idle_vm| idle_vm.vm.cid == idle_vm_cid }
+        if deallocated_vm.nil?
+          raise DirectorError, "Resource pool `#{@name}' does not contain an allocated VM with the cid `#{idle_vm_cid}'"
+        end
+
+        @logger.info("Deallocating VM: #{deallocated_vm.vm.cid}")
         @allocated_vms.delete(deallocated_vm)
-        @idle_vms << deallocated_vm
-        deallocated_vm
+
+        add_idle_vm unless dynamically_sized? # don't refill if dynamically sized
+
+        nil
       end
 
       # "Active" VM is a VM that is currently running a job
@@ -136,7 +154,7 @@ module Bosh::Director
       # @return [void]
       def reserve_capacity(n)
         needed = @reserved_capacity + n
-        if needed > @size
+        if !dynamically_sized? && needed > @size
           raise ResourcePoolNotEnoughCapacity,
                 "Resource pool `#{@name}' is not big enough: " +
                 "#{needed} VMs needed, capacity is #{@size}"
@@ -159,12 +177,17 @@ module Bosh::Director
         end
       end
 
+      def dynamically_sized?
+        @size.nil?
+      end
+
       private
 
       # Returns a number of VMs that need to be created in order to bring
       # this resource pool to a desired size
       # @return [Integer]
       def missing_vm_count
+        return 0 if dynamically_sized?
         @size - @active_vm_count - @idle_vms.size
       end
     end

data/lib/bosh/director/deployment_plan/updater.rb

@@ -17,6 +17,12 @@ module Bosh::Director
           @assembler.bind_dns
         end
 
+        @logger.info('Deleting no longer needed VMs')
+        @assembler.delete_unneeded_vms
+
+        @logger.info('Deleting no longer needed instances')
+        @assembler.delete_unneeded_instances
+
         @logger.info('Updating resource pools')
         @resource_pools.update
         @base_job.task_checkpoint
@@ -29,12 +35,6 @@ module Bosh::Director
           @assembler.bind_configuration
         end
 
-        @logger.info('Deleting no longer needed VMs')
-        @assembler.delete_unneeded_vms
-
-        @logger.info('Deleting no longer needed instances')
-        @assembler.delete_unneeded_instances
-
         @logger.info('Updating jobs')
         @multi_job_updater.run(
           @base_job,

data/lib/bosh/director/errand/job_manager.rb

@@ -4,14 +4,16 @@ module Bosh::Director
     # @param [Bosh::Director::DeploymentPlan::Job] job
     # @param [Bosh::Blobstore::Client] blobstore
     # @param [Bosh::Director::EventLog::Log] event_log
-    def initialize(deployment, job, blobstore, event_log)
+    # @param [Logger] logger
+    def initialize(deployment, job, blobstore, event_log, logger)
       @deployment = deployment
       @job = job
       @blobstore = blobstore
       @event_log = event_log
+      @logger = logger
     end
 
-    # Creates/updates all job instances
+    # Creates/updates all errand job instances
     # @return [void]
     def update_instances
       dns_binder = DeploymentPlan::DnsBinder.new(@deployment)
@@ -27,15 +29,17 @@ module Bosh::Director
       job_updater.update
     end
 
-    # Deletes created all job instances
+    # Deletes all errand job instances
     # @return [void]
     def delete_instances
       instances = @job.instances.map(&:model).compact
-      return if instances.empty?
-
-      event_log_stage = @event_log.begin_stage(
-        'Deleting instances', instances.size, [@job.name])
+      if instances.empty?
+        @logger.info('No errand instances to delete')
+        return
+      end
 
+      @logger.info('Deleting errand instances')
+      event_log_stage = @event_log.begin_stage('Deleting errand instances', instances.size, [@job.name])
       instance_deleter = InstanceDeleter.new(@deployment)
       instance_deleter.delete_instances(instances, event_log_stage)
 
@@ -44,13 +48,12 @@ module Bosh::Director
 
     private
 
+    # Deallocates all errand VMs
+    # @return [void]
     def deallocate_vms
-      instance_cids = @job.instances.map { |i| i.model.vm.cid }
-
-      instance_cids.each do |cid|
-        idle_vm = @job.resource_pool.deallocate_vm(cid)
-        idle_vm.clean_vm
-      end
+      @logger.info('Deallocating errand VMs')
+      instance_vm_cids = @job.instances.map { |i| i.model.vm.cid }
+      instance_vm_cids.each { |cid| @job.resource_pool.deallocate_vm(cid) }
     end
   end
 end

data/lib/bosh/director/job_runner.rb

@@ -53,7 +53,7 @@ module Bosh::Director
       event_log = File.join(log_dir, 'event')
       result_log = File.join(log_dir, 'result')
 
-      @task_logger = Logger.new(debug_log)
+      @task_logger = MonoLogger.new(debug_log)
       @task_logger.level = Config.logger.level
       @task_logger.formatter = ThreadFormatter.new
 

data/lib/bosh/director/jobs/run_errand.rb

@@ -24,7 +24,7 @@ module Bosh::Director
     def perform
       deployment_model = @deployment_manager.find_by_name(@deployment_name)
       manifest = Psych.load(deployment_model.manifest)
-      deployment = DeploymentPlan::Planner.parse(manifest, event_log, {})
+      deployment = DeploymentPlan::Planner.parse(manifest, {}, event_log, logger)
 
       job = deployment.job(@errand_name)
       if job.nil?
@@ -70,38 +70,38 @@ module Bosh::Director
       deployment_preparer = Errand::DeploymentPreparer.new(deployment, job, event_log, self)
 
       rp_updaters = [ResourcePoolUpdater.new(job.resource_pool)]
-      rp_manager = DeploymentPlan::ResourcePools.new(event_log, rp_updaters)
+      resource_pools = DeploymentPlan::ResourcePools.new(event_log, rp_updaters)
 
-      job_manager = Errand::JobManager.new(deployment, job, @blobstore, event_log)
+      job_manager = Errand::JobManager.new(deployment, job, @blobstore, event_log, logger)
 
       begin
-        update_instances(deployment_preparer, rp_manager, job_manager)
+        update_instances(deployment_preparer, resource_pools, job_manager)
         blk.call
       ensure
-        delete_instances(rp_manager, job_manager)
+        delete_instances(resource_pools, job_manager)
       end
     end
 
-    def update_instances(deployment_preparer, rp_manager, job_manager)
+    def update_instances(deployment_preparer, resource_pools, job_manager)
       logger.info('Starting to prepare for deployment')
       deployment_preparer.prepare_deployment
       deployment_preparer.prepare_job
 
       logger.info('Starting to update resource pool')
-      rp_manager.update
+      resource_pools.update
 
       logger.info('Starting to update job instances')
       job_manager.update_instances
     end
 
-    def delete_instances(rp_manager, job_manager)
+    def delete_instances(resource_pools, job_manager)
       @ignore_cancellation = true
 
       logger.info('Starting to delete job instances')
       job_manager.delete_instances
 
       logger.info('Starting to refill resource pool')
-      rp_manager.refill
+      resource_pools.refill
 
       @ignore_cancellation = false
     end

data/lib/bosh/director/jobs/update_deployment.rb

@@ -29,7 +29,7 @@ module Bosh::Director
         }
 
         manifest_as_hash = Psych.load(@manifest)
-        @deployment_plan = DeploymentPlan::Planner.parse(manifest_as_hash, event_log, plan_options)
+        @deployment_plan = DeploymentPlan::Planner.parse(manifest_as_hash, plan_options, event_log, logger)
         logger.info('Created deployment plan')
 
         resource_pools = @deployment_plan.resource_pools

data/lib/bosh/director/resource_pool_updater.rb

@@ -176,6 +176,7 @@ module Bosh::Director
     end
 
     def extra_vm_count
+      return 0 if @resource_pool.dynamically_sized?
       @resource_pool.active_vm_count +
           @resource_pool.idle_vms.size +
           @resource_pool.allocated_vms.size -

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2611.0'
+    VERSION = '1.2619.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -1,7 +1,7 @@
 require 'digest/sha1'
 require 'fileutils'
 require 'securerandom'
-require 'logger'
+require 'mono_logger'
 
 module Bosh
   module Clouds
@@ -25,7 +25,7 @@ module Bosh
 
         @running_vms_dir = File.join(@base_dir, 'running_vms')
 
-        @logger = Logger.new(options['log_device'] || STDOUT)
+        @logger = MonoLogger.new(options['log_device'] || STDOUT)
 
         @commands = CommandTransport.new(@base_dir, @logger)
 
@@ -91,8 +91,13 @@ module Bosh
 
       def configure_networks(vm_id, networks)
         cmd = commands.next_configure_networks_cmd(vm_id)
-        raise NotSupported, 'Dummy CPI was configured to return NotSupported' if cmd.not_supported
-        raise NotImplemented, 'Dummy CPI does not implement configure_networks'
+
+        # The only configure_networks test so far only tests the negative case.
+        # If a positive case is added, the agent will need to be re-started.
+        # Normally runit would handle that.
+        if cmd.not_supported || true
+          raise NotSupported, 'Dummy CPI was configured to return NotSupported'
+        end
       end
 
       def attach_disk(vm_id, disk_id)
@@ -278,12 +283,12 @@ module Bosh
           @logger.info('Reading create_vm configuration')
           always_path = File.join(@cpi_commands, 'create_vm', 'always')
           ip_address = File.read(always_path) if File.exists?(always_path)
-          CreareVmCommand.new(ip_address)
+          CreateVmCommand.new(ip_address)
         end
       end
 
       class ConfigureNetworksCommand < Struct.new(:not_supported); end
-      class CreareVmCommand < Struct.new(:ip_address); end
+      class CreateVmCommand < Struct.new(:ip_address); end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2611.0
+  version: 1.2619.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2611.0
+        version: 1.2619.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.4
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +338,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -330,7 +346,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: resque-backtrace
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +509,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  6129ec'
+  a38edb'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -754,7 +770,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4501133307616993299
+      hash: -2708480471074860052
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2