bosh-director 1.3184.1.0 → 1.3189.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c4413721bdb4e215a926c4cc6b111cc28baa54
-  data.tar.gz: a0dba6c7573e8940d25a659c269640e26620350f
+  metadata.gz: 905be5da3a96e10ebf3cfb7db382e8c796aa3bd9
+  data.tar.gz: 21ed2f9157ef126907fd81fb43aec8c53baa287d
 SHA512:
-  metadata.gz: 7e942343443a03e57391ce7771b20fbe9b3a3973c692598908fa97382ad8ca950ba5eb658caab0de43df5aa3f921cc414d96f312ea002a8b7ed67045cc13c22b
-  data.tar.gz: c8de0e3d71c3f7272cec52fb4bf9a3d34ab3619977eaa790a5cc31f7eb06b50fae11dbbb5013e21459d52a5a899e5610ed116a179f21a6b363569fd0a115a377
+  metadata.gz: 23a1227b08905d82d4b7c4e31c88933d9d0c602fccb14494a94e9bd3359f9ed197365396353c789de83a2663bb1ebc86418af2d62962ea5a62cd2a680acb6d93
+  data.tar.gz: 7af6e69ee09250ddb16b2c31cba4e5172f5cb822793a435203a5f55b1ec2e19d3fdb114a4fc44714888c7ce9626f68e933421df2a5d4b8f9bf6453238a8ef932

data/lib/bosh/director.rb

@@ -135,6 +135,7 @@ require 'bosh/director/jobs/cloud_check/scan_and_fix'
 require 'bosh/director/jobs/cloud_check/apply_resolutions'
 require 'bosh/director/jobs/release/release_job'
 require 'bosh/director/jobs/ssh'
+require 'bosh/director/jobs/attach_disk'
 require 'bosh/director/jobs/helpers'
 
 require 'bosh/director/models/helpers/model_helper'

data/lib/bosh/director/api/controllers/disks_controller.rb

@@ -9,6 +9,14 @@ module Bosh::Director
         json_encode(orphan_json)
       end
 
+      # PUT /disks/disk_cid/attachments?deployment=foo&job=dea&instance_id=17f01a35-bf9c-4949-bcf2-c07a95e4df33
+      put '/:disk_cid/attachments' do
+        job_queue = JobQueue.new
+        task = Bosh::Director::Jobs::AttachDisk.enqueue(current_user, params[:deployment], params[:job], params[:instance_id], params[:disk_cid], job_queue)
+
+        redirect "/tasks/#{task.id}"
+      end
+
       delete '/:orphan_disk_cid' do
         job_queue = JobQueue.new
         task = Bosh::Director::Jobs::DeleteOrphanDisks.enqueue(current_user, [params[:orphan_disk_cid]], job_queue)

data/lib/bosh/director/api/controllers/tasks_controller.rb

@@ -20,6 +20,7 @@ module Bosh::Director
         verbose = params['verbose'] || '1'
         if verbose == '1'
           dataset = dataset.filter(type: %w[
+            attach_disk
             create_snapshot
             delete_deployment
             delete_release

data/lib/bosh/director/cloudcheck_helper.rb

@@ -38,22 +38,15 @@ module Bosh::Director
       instance.update(vm_cid: nil, agent_id: nil, trusted_certs_sha1: nil, credentials: nil)
     end
 
-    def recreate_vm(instance)
-      @logger.debug("Recreating Vm: #{@instance})")
-      existing_vm_env = instance.vm_env
-
-      validate_spec(instance.spec)
-      validate_env(instance.vm_env)
-
-      instance_plan_to_delete = DeploymentPlan::InstancePlan.new(
-        existing_instance: instance,
-        instance: nil,
-        desired_instance: nil,
-        network_plans: []
-      )
+    def recreate_vm(instance_model)
+      @logger.debug("Recreating Vm: #{instance_model})")
+      existing_vm_env = instance_model.vm_env
+
+      validate_spec(instance_model.spec)
+      validate_env(instance_model.vm_env)
 
       begin
-        vm_deleter.delete_for_instance(instance_plan_to_delete.existing_instance)
+        vm_deleter.delete_for_instance(instance_model)
       rescue Bosh::Clouds::VMNotFound
         # One situation where this handler is actually useful is when
         # VM has already been deleted but something failed after that
@@ -61,32 +54,32 @@ module Bosh::Director
         # to ignore "VM not found" errors in `delete_vm' and let the method
         # proceed creating a new VM. Other errors are not forgiven.
 
-        @logger.warn("VM '#{instance.vm_cid}' might have already been deleted from the cloud")
+        @logger.warn("VM '#{instance_model.vm_cid}' might have already been deleted from the cloud")
       end
 
-      instance_plan_to_create = create_instance_plan(instance, existing_vm_env)
+      instance_plan_to_create = create_instance_plan(instance_model, existing_vm_env)
 
       vm_creator.create_for_instance_plan(
         instance_plan_to_create,
-        Array(instance.persistent_disk_cid)
+        Array(instance_model.persistent_disk_cid)
       )
 
       dns_manager = DnsManagerProvider.create
       dns_names_to_ip = {}
 
       instance_plan_to_create.existing_instance.spec['networks'].each do |network_name, network|
-        index_dns_name = dns_manager.dns_record_name(instance.index, instance.job, network_name, instance.deployment.name)
+        index_dns_name = dns_manager.dns_record_name(instance_model.index, instance_model.job, network_name, instance_model.deployment.name)
         dns_names_to_ip[index_dns_name] = network['ip']
-        id_dns_name = dns_manager.dns_record_name(instance.uuid, instance.job, network_name, instance.deployment.name)
+        id_dns_name = dns_manager.dns_record_name(instance_model.uuid, instance_model.job, network_name, instance_model.deployment.name)
         dns_names_to_ip[id_dns_name] = network['ip']
       end
 
-      @logger.debug("Updating DNS record for instance: #{instance.inspect}; to: #{dns_names_to_ip.inspect}")
-      dns_manager.update_dns_record_for_instance(instance, dns_names_to_ip)
+      @logger.debug("Updating DNS record for instance: #{instance_model.inspect}; to: #{dns_names_to_ip.inspect}")
+      dns_manager.update_dns_record_for_instance(instance_model, dns_names_to_ip)
       dns_manager.flush_dns_cache
 
-      cleaner = RenderedJobTemplatesCleaner.new(instance, App.instance.blobstores.blobstore, @logger)
-      InstanceUpdater::StateApplier.new(instance_plan_to_create, agent_client(instance.credentials, instance.agent_id), cleaner, @logger).apply
+      cleaner = RenderedJobTemplatesCleaner.new(instance_model, App.instance.blobstores.blobstore, @logger)
+      InstanceUpdater::StateApplier.new(instance_plan_to_create, agent_client(instance_model.credentials, instance_model.agent_id), cleaner, @logger).apply
     end
 
     private

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

@@ -171,8 +171,8 @@ module Bosh::Director
         end
 
         if disk_type_name
-            disk_name = disk_type_name
-            disk_source = 'type'
+          disk_name = disk_type_name
+          disk_source = 'type'
         else
           disk_name = disk_pool_name
           disk_source = 'pool'
@@ -225,10 +225,9 @@ module Bosh::Director
       end
 
       def parse_resource_pool
-        job_env_hash = safe_property(@job_spec, 'env', class: Hash, :default => {})
-        @job.env = Env.new(job_env_hash)
-
+        env_hash = safe_property(@job_spec, 'env', class: Hash, :default => {})
         resource_pool_name = safe_property(@job_spec, "resource_pool", class: String, optional: true)
+
         if resource_pool_name
           resource_pool = @deployment.resource_pool(resource_pool_name)
           if resource_pool.nil?
@@ -236,36 +235,40 @@ module Bosh::Director
               "Job `#{@job.name}' references an unknown resource pool `#{resource_pool_name}'"
           end
 
-          @job.vm_type = VmType.new({
-              'name' => resource_pool.name,
-              'cloud_properties' => resource_pool.cloud_properties
-            })
+          vm_type = VmType.new({
+            'name' => resource_pool.name,
+            'cloud_properties' => resource_pool.cloud_properties
+          })
 
-          @job.stemcell = resource_pool.stemcell
+          stemcell = resource_pool.stemcell
 
-          if  !job_env_hash.empty? && !resource_pool.env.empty?
+          if !env_hash.empty? && !resource_pool.env.empty?
             raise JobAmbiguousEnv,
               "Job '#{@job.name}' and resource pool: '#{resource_pool_name}' both declare env properties"
           end
 
-          @job.env = Env.new(resource_pool.env)
-
-          return
-        end
+          if env_hash.empty?
+            env_hash = resource_pool.env
+          end
+        else
+          vm_type_name = safe_property(@job_spec, 'vm_type', class: String)
+          vm_type = @deployment.vm_type(vm_type_name)
+          if vm_type.nil?
+            raise JobUnknownVmType,
+              "Job `#{@job.name}' references an unknown vm type `#{vm_type_name}'"
+          end
 
-        vm_type_name = safe_property(@job_spec, 'vm_type', class: String)
-        @job.vm_type = @deployment.vm_type(vm_type_name)
-        if @job.vm_type.nil?
-          raise JobUnknownVmType,
-            "Job `#{@job.name}' references an unknown vm type `#{vm_type_name}'"
+          stemcell_name = safe_property(@job_spec, 'stemcell', class: String)
+          stemcell = @deployment.stemcell(stemcell_name)
+          if stemcell.nil?
+            raise JobUnknownStemcell,
+              "Job `#{@job.name}' references an unknown stemcell `#{stemcell_name}'"
+          end
         end
 
-        stemcell_name = safe_property(@job_spec, 'stemcell', class: String)
-        @job.stemcell = @deployment.stemcell(stemcell_name)
-        if @job.stemcell.nil?
-          raise JobUnknownStemcell,
-            "Job `#{@job.name}' references an unknown stemcell `#{stemcell_name}'"
-        end
+        @job.vm_type = vm_type
+        @job.stemcell = stemcell
+        @job.env = Env.new(env_hash)
       end
 
       def parse_update_config

data/lib/bosh/director/disk_manager.rb

@@ -27,7 +27,10 @@ module Bosh::Director
         disk.update(:active => true) if disk
       end
 
-      delete_mounted_persistent_disk(instance, old_disk) if old_disk
+      orphan_mounted_persistent_disk(instance, old_disk) if old_disk
+
+      inactive_disks = Models::PersistentDisk.where(active: false, instance: instance.model)
+      inactive_disks.each{|disk| detach_and_orphan_disk(disk, instance.model) }
     end
 
     def attach_disks_if_needed(instance_plan)
@@ -35,18 +38,7 @@ module Bosh::Director
         @logger.warn('Skipping disk attachment, instance no longer needs disk')
         return
       end
-
-      instance = instance_plan.instance
-      disk_cid = instance.model.persistent_disk_cid
-      return @logger.info('Skipping disk attaching') if disk_cid.nil?
-      instance_model = instance.model
-      begin
-        @cloud.attach_disk(instance_model.vm_cid, disk_cid)
-        AgentClient.with_vm_credentials_and_agent_id(instance_model.credentials, instance_model.agent_id).mount_disk(disk_cid)
-      rescue => e
-        @logger.warn("Failed to attach disk to new VM: #{e.inspect}")
-        raise e
-      end
+      attach_disk(instance_plan.instance.model)
     end
 
     def delete_persistent_disks(instance_model)
@@ -67,8 +59,7 @@ module Bosh::Director
         )
 
         orphan_snapshots(disk.snapshots, orphan_disk)
-        @logger.info("Orphaning disk: '#{disk.disk_cid}', " +
-            "#{disk.active ? "active" : "inactive"}")
+        @logger.info("Orphaning disk: '#{disk.disk_cid}', #{disk.active ? "active" : "inactive"}")
 
         disk.destroy
       end
@@ -90,7 +81,7 @@ module Bosh::Director
 
     def delete_orphan_disk_by_disk_cid(disk_cid)
       @logger.info("Deleting orphan disk: #{disk_cid}")
-      orphan_disk = Bosh::Director::Models::OrphanDisk.where(disk_cid: disk_cid).first
+      orphan_disk = Models::OrphanDisk.where(disk_cid: disk_cid).first
       if orphan_disk
         delete_orphan_disk(orphan_disk)
       else
@@ -120,6 +111,19 @@ module Bosh::Director
 
     private
 
+    def attach_disk(instance_model)
+      disk_cid = instance_model.persistent_disk_cid
+      return @logger.info('Skipping disk attaching') if disk_cid.nil?
+
+      begin
+        @cloud.attach_disk(instance_model.vm_cid, disk_cid)
+        AgentClient.with_vm_credentials_and_agent_id(instance_model.credentials, instance_model.agent_id).mount_disk(disk_cid)
+      rescue => e
+        @logger.warn("Failed to attach disk to new VM: #{e.inspect}")
+        raise e
+      end
+    end
+
     def delete_orphan_snapshot(orphan_snapshot)
       begin
         snapshot_cid = orphan_snapshot.snapshot_cid
@@ -145,7 +149,7 @@ module Bosh::Director
       end
     end
 
-    def delete_mounted_persistent_disk(instance, disk)
+    def orphan_mounted_persistent_disk(instance, disk)
       unmount(instance, disk)
 
       disk_cid = disk.disk_cid
@@ -154,17 +158,20 @@ module Bosh::Director
         return
       end
 
+      detach_and_orphan_disk(disk, instance.model)
+    end
+
+    def detach_and_orphan_disk(disk, instance_model)
       begin
-        @logger.info("Detaching disk #{disk_cid}")
-        @cloud.detach_disk(instance.model.vm_cid, disk_cid)
+        @logger.info("Detaching disk #{disk.disk_cid}")
+        @cloud.detach_disk(instance_model.vm_cid, disk.disk_cid)
       rescue Bosh::Clouds::DiskNotAttached
         if disk.active
           raise CloudDiskNotAttached,
-            "`#{instance}' VM should have persistent disk attached " +
-              "but it doesn't (according to CPI)"
+                "`#{instance_model}' VM should have persistent disk attached " +
+                  "but it doesn't (according to CPI)"
         end
       end
-
       orphan_disk(disk)
     end
 
@@ -175,11 +182,11 @@ module Bosh::Director
         return
       end
 
-      if disks(instance).include?(disk_cid)
+      if agent_mounted_disks(instance).include?(disk_cid)
         @logger.info("Stopping instance '#{instance}' before unmount")
-        agent(instance).stop
+        agent_client(instance).stop
         @logger.info("Unmounting disk '#{disk_cid}'")
-        agent(instance).unmount_disk(disk_cid)
+        agent_client(instance).unmount_disk(disk_cid)
       end
     end
 
@@ -189,7 +196,7 @@ module Bosh::Director
     def check_persistent_disk(instance_plan)
       instance = instance_plan.instance
       return if instance.model.persistent_disks.empty?
-      agent_disk_cid = disks(instance).first
+      agent_disk_cid = agent_mounted_disks(instance).first
 
       if agent_disk_cid.nil? && !instance_plan.needs_disk?
         @logger.debug('Disk is already detached')
@@ -207,11 +214,11 @@ module Bosh::Director
       end
     end
 
-    def disks(instance)
-      agent(instance).list_disk
+    def agent_mounted_disks(instance)
+      agent_client(instance).list_disk
     end
 
-    def agent(instance)
+    def agent_client(instance)
       AgentClient.with_vm_credentials_and_agent_id(instance.model.credentials, instance.model.agent_id)
     end
 
@@ -240,11 +247,14 @@ module Bosh::Director
     end
 
     def mount_and_migrate_disk(instance, new_disk, old_disk)
-      agent(instance).mount_disk(new_disk.disk_cid)
-      agent(instance).migrate_disk(old_disk.disk_cid, new_disk.disk_cid) if old_disk
+      agent_client = agent_client(instance)
+      agent_client.mount_disk(new_disk.disk_cid)
+      # Mirgate to and from cids are actually ignored by the agent.
+      # The first mount invocation is the source, and the last mount invocation is the target.
+      agent_client.migrate_disk(old_disk.disk_cid, new_disk.disk_cid) if old_disk
     rescue => e
       @logger.debug("Failed to migrate disk, deleting new disk. #{e.inspect}")
-      delete_mounted_persistent_disk(instance, new_disk)
+      orphan_mounted_persistent_disk(instance, new_disk)
       raise e
     end
 

data/lib/bosh/director/dns/powerdns.rb

@@ -52,16 +52,6 @@ module Bosh::Director
         @logger.info("Deleting DNS record: #{record.name}")
         record.destroy
       end
-
-      # see if any of the reverse domains are empty and should be deleted
-      ips.each do |ip|
-        reverse = reverse_domain(ip)
-        rdomain = Models::Dns::Domain.filter(name: reverse,
-          type: 'NATIVE')
-        rdomain.each do |domain|
-          delete_empty_domain(domain)
-        end
-      end
     end
 
     private
@@ -88,40 +78,31 @@ module Bosh::Director
       reverse_domain = reverse_domain(ip_address)
       reverse_host = reverse_host(ip_address)
 
-      rdomain = Models::Dns::Domain.safe_find_or_create(name: reverse_domain,
-        type: 'NATIVE')
-      Models::Dns::Record.find_or_create(domain_id: rdomain.id,
+      rdomain = Models::Dns::Domain.safe_find_or_create(name: reverse_domain, type: 'NATIVE')
+
+      Models::Dns::Record.find_or_create(
+        domain: rdomain,
         name: reverse_domain,
         type: 'SOA', content: SOA,
-        ttl: TTL_4H)
+        ttl: TTL_4H
+      )
 
-      Models::Dns::Record.find_or_create(domain_id: rdomain.id,
+      Models::Dns::Record.find_or_create(
+        domain: rdomain,
         name: reverse_domain,
         type: 'NS', ttl: TTL_4H,
-        content: "ns.#{@domain_name}")
-
-      record = Models::Dns::Record.find(content: record_name, type: 'PTR')
-
-      # delete the record if the IP address changed
-      if record && record.name != reverse_host
-        id = record.domain_id
-        record.destroy
-        record = nil
-
-        # delete the domain if the domain id changed and it's empty
-        if id != rdomain.id
-          delete_empty_domain(Models::Dns::Domain[id])
-        end
-      end
+        content: "ns.#{@domain_name}"
+      )
 
-      unless record
-        record = Models::Dns::Record.new(domain_id: rdomain.id,
-          name: reverse_host,
-          type: 'PTR', ttl: TTL_5M)
-      end
-      record.content = record_name
-      record.change_date = Time.now.to_i
-      record.save
+      record = Models::Dns::Record.find_or_create(content: record_name, type: 'PTR')
+      record.update(
+        domain: rdomain,
+        name: reverse_host,
+        content: record_name,
+        type: 'PTR',
+        ttl: TTL_5M,
+        change_date: Time.now.to_i
+      )
     end
 
     def find_domain_id
@@ -148,23 +129,5 @@ module Bosh::Director
       octets = ip.split(/\./)
       "#{octets[0..(n-1)].reverse.join(".")}.in-addr.arpa"
     end
-
-    def delete_empty_domain(domain)
-      # If the count is 2, it means we only have the NS & SOA record
-      # and the domain is "empty" and can be deleted
-      if domain.records.size == 2
-        @logger.info("Deleting empty reverse domain #{domain.name}")
-
-        # Since DNS domain can be deleted by multiple threads
-        # it's possible for database to return 0 rows modified result.
-        # In this specific case that's a valid return value
-        # but Sequel usually considers that an error.
-        # ('Attempt to delete object did not result in a single row modification')
-        domain.require_modification = false
-
-        # Cascaded - all records are removed
-        domain.destroy
-      end
-    end
   end
 end

data/lib/bosh/director/errors.rb

@@ -262,6 +262,9 @@ module Bosh::Director
   # Run errand errors
   RunErrandError = err(510000)
 
-  #Deleting Disk
+  # Disk errors
   DeletingPersistentDiskError = err(520000)
+  AttachDiskErrorUnknownInstance = err(520001)
+  AttachDiskNoPersistentDisk =  err(520002)
+  AttachDiskInvalidInstanceState = err(520003)
 end

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

@@ -0,0 +1,47 @@
+module Bosh::Director
+  module Jobs
+    class AttachDisk < BaseJob
+
+      @queue = :normal
+
+      def self.job_type
+        :attach_disk
+      end
+
+      def self.enqueue(username, deployment_name, job_name, instance_id, disk_cid, job_queue)
+        job_queue.enqueue(username, Jobs::AttachDisk, "attach disk '#{disk_cid}' to '#{job_name}/#{instance_id}'", [deployment_name, job_name, instance_id, disk_cid])
+      end
+
+      def initialize(deployment_name, job_name, instance_id, disk_cid)
+        @deployment_name = deployment_name
+        @job_name = job_name
+        @instance_id = instance_id
+        @disk_cid = disk_cid
+        @transactor = Transactor.new
+      end
+
+      def perform
+        instance = Models::Instance.filter(job: @job_name, uuid: @instance_id).to_a.first
+
+        if instance.nil? || instance.deployment.name != @deployment_name
+          raise AttachDiskErrorUnknownInstance, "Instance '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}' was not found"
+        end
+
+        if instance.persistent_disk.nil?
+          raise AttachDiskNoPersistentDisk, "Job '#{@job_name}' is not configured with a persistent disk"
+        end
+
+        if instance.state != 'detached'
+          raise AttachDiskInvalidInstanceState, "Instance '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}' must be in 'bosh stopped --hard' state"
+        end
+
+        @transactor.retryable_transaction(instance.db) do
+          instance.persistent_disk.update(active: false)
+          Models::PersistentDisk.create(disk_cid: @disk_cid, instance_id: instance.id, active: true, size: 1, cloud_properties: {})
+        end
+
+        "attached disk '#{@disk_cid}' to '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}'"
+      end
+    end
+  end
+end

data/lib/bosh/director/manifest/diff_lines.rb

@@ -28,6 +28,11 @@ module Bosh::Director
       jobs
     )
 
+    REDACT_KEY_NAMES = %w(
+      properties
+      env
+    )
+
     def order
       sections = {}
       key = nil
@@ -63,7 +68,7 @@ module Bosh::Director
       while i < self.size
         line = self[i]
 
-        if line.text =~ /\bproperties:/
+        if REDACT_KEY_NAMES.any? { |key_name| line.text =~ /\b#{key_name}:/ }
           properties_indent = line.full_indent
           i += 1
           line = self[i]

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3184.1.0'
+    VERSION = '1.3189.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -308,6 +308,16 @@ module Bosh
         agent_base_dir(agent_id)
       end
 
+      def disk_attached_to_vm?(vm_cid, disk_id)
+        File.exist?(attachment_file(vm_cid, disk_id))
+      end
+
+      def current_apply_spec_for_vm(vm_cid)
+        agent_base_dir = agent_dir_for_vm_cid(vm_cid)
+        spec_file = File.join(agent_base_dir, 'bosh', 'spec.json')
+        JSON.parse(File.read(spec_file))
+      end
+
       private
 
       def spawn_agent_process(agent_id)
@@ -419,10 +429,6 @@ module Bosh
         File.exist?(attachment_path(disk_id))
       end
 
-      def disk_attached_to_vm?(vm_cid, disk_id)
-        File.exist?(attachment_file(vm_cid, disk_id))
-      end
-
       def detach_disks_attached_to_vm(vm_cid)
         @logger.info("Detaching disks for vm #{vm_cid}")
         Dir.glob(attachment_file(vm_cid, '*')) do |file_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3184.1.0
+  version: 1.3189.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,154 +16,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3184.1.0
+        version: 1.3189.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -833,6 +833,7 @@ files:
 - lib/bosh/director/job_runner.rb
 - lib/bosh/director/job_updater.rb
 - lib/bosh/director/job_updater_factory.rb
+- lib/bosh/director/jobs/attach_disk.rb
 - lib/bosh/director/jobs/backup.rb
 - lib/bosh/director/jobs/base_job.rb
 - lib/bosh/director/jobs/cleanup_artifacts.rb