bosh-director 1.2697.0 → 1.2707.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d649b286bedcac58fa6f85f1b6105c93b4c17dbe
-  data.tar.gz: a6108b5300cdaf33a3ca9b96f7a0e4c7f2a0ebb7
+  metadata.gz: bd2368ca7c56210e18e39bc6f81b29b2ca47e060
+  data.tar.gz: 1fe2d88dfbf4a030afc8871d22d12750971fdd4d
 SHA512:
-  metadata.gz: 1917e656e559efdb5476a444f488791c41e03c61df3e05f213b6249b479fd0dba2869f13808f2b9da00ce5588a958fe3acac92ba61aa001ae0c9ceb734f647d6
-  data.tar.gz: e38dd3342bbd99ffd68e5d70ff59834aaa1290a3956494cb22a4a2e46ac3822e991fab456c5a4fb6c2c82c6082dcd0cd31a31859173fbb0aa9e8422adc3cab73
+  metadata.gz: f4db2ae69dd040879328171db70e33b0131e610a788496a0e5250b037a5fa2ef06c5474e58e0ee35eb7e372d75866baeed7c8b78d67b3fdae6fd056a3764a6b6
+  data.tar.gz: 73254ebe551fce559859976d2b2461c7677b329f74c860608c18a87b35116805ebfff82ccc0c232cc526f902f6c1b25d3a32030aeb1549037877b8d6cc800b74

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

@@ -5,15 +5,14 @@ module Bosh::Director
     class TasksController < BaseController
       get '/' do
         dataset = Models::Task.dataset
-        limit = params['limit']
-        if limit
+
+        if limit = params['limit']
           limit = limit.to_i
           limit = 1 if limit < 1
           dataset = dataset.limit(limit)
         end
 
         states = params['state'].to_s.split(',')
-
         if states.size > 0
           dataset = dataset.filter(:state => states)
         end
@@ -21,16 +20,17 @@ module Bosh::Director
         verbose = params['verbose'] || '1'
         if verbose == '1'
           dataset = dataset.filter(type: %w[
-          update_deployment
-          delete_deployment
-          update_release
-          delete_release
-          update_stemcell
-          delete_stemcell
-          create_snapshot
-          delete_snapshot
-          snapshot_deployment
-        ])
+            create_snapshot
+            delete_deployment
+            delete_release
+            delete_snapshot
+            delete_stemcell
+            run_errand
+            snapshot_deployment
+            update_deployment
+            update_release
+            update_stemcell
+          ])
         end
 
         tasks = dataset.order_by(:timestamp.desc).map do |task|

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

@@ -27,6 +27,7 @@ module Bosh::Director
         parse_compilation
         parse_update
         parse_resource_pools
+        parse_disk_pools
         parse_jobs
 
         @deployment
@@ -110,6 +111,14 @@ module Bosh::Director
         # raise "No resource pools specified." if @resource_pools.empty?
       end
 
+      def parse_disk_pools
+        disk_pools = safe_property(@manifest, 'disk_pools', :class => Array, :optional => true)
+        return if disk_pools.nil?
+        disk_pools.each do |dp_spec|
+          @deployment.add_disk_pool(DiskPool.parse(dp_spec))
+        end
+      end
+
       def parse_jobs
         jobs = safe_property(@manifest, 'jobs', :class => Array, :default => [])
         jobs.each do |job_spec|

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

@@ -0,0 +1,56 @@
+module Bosh::Director
+  module DeploymentPlan
+    class DiskPool
+
+      # @return [String] Disk pool name
+      attr_accessor :name
+
+      # @return [Integer] Disk size (or nil)
+      attr_accessor :disk_size
+
+      # @return [Hash] cloud properties to use when creating VMs.
+      attr_accessor :cloud_properties
+
+      def self.parse(dp_spec)
+        DiskPoolParser.new.parse(dp_spec)
+      end
+
+      def initialize(name)
+        @name = name
+        @disk_size = 0
+        @cloud_properties = {}
+      end
+
+      def spec
+        {
+          'name' => name,
+          'disk_size' => disk_size,
+          'cloud_properties' => cloud_properties,
+        }
+      end
+
+      private
+
+      class DiskPoolParser
+        include ValidationHelper
+
+        def parse(dp_spec)
+          name = safe_property(dp_spec, 'name', class: String)
+          disk_pool = DiskPool.new(name)
+
+          disk_size = safe_property(dp_spec, 'disk_size', class: Integer, default: 0)
+          if disk_size < 0
+            raise DiskPoolInvalidDiskSize,
+              "Disk pool `#{name}' references an invalid peristent disk size `#{disk_size}'"
+          end
+          disk_pool.disk_size = disk_size
+
+          disk_pool.cloud_properties = safe_property(dp_spec, 'cloud_properties', class: Hash, default: {})
+
+          disk_pool
+        end
+      end
+
+    end
+  end
+end

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

@@ -233,7 +233,12 @@ module Bosh::Director
       # @return [Integer] persistent disk size
       def disk_size
         if @model.nil?
-          current_state['persistent_disk'].to_i
+          disk_pool = current_state['persistent_disk_pool']
+          if disk_pool
+            disk_pool['disk_size'].to_i
+          else
+            current_state['persistent_disk'].to_i
+          end
         elsif @model.persistent_disk
           @model.persistent_disk.size
         else
@@ -241,6 +246,17 @@ module Bosh::Director
         end
       end
 
+      ##
+      # @return [Hash] persistent disk cloud properties
+      def disk_cloud_properties
+        disk_pool = current_state['persistent_disk_pool']
+        if disk_pool
+          disk_pool['cloud_properties']
+        else
+          {}
+        end
+      end
+
       ##
       # @return [Hash<String, String>] dns record hash of dns name and IP
       def dns_record_info
@@ -326,10 +342,12 @@ module Bosh::Director
       end
 
       ##
-      # @return [Boolean] returns true if the expected persistent disk differs
-      #   from the one currently configured on the VM
+      # @return [Boolean] returns true if the expected persistent disk or cloud_properties differs
+      #   from the state currently configured on the VM
       def persistent_disk_changed?
-        @job.persistent_disk != disk_size
+        new_disk_size = @job.persistent_disk_pool ? @job.persistent_disk_pool.disk_size : 0
+        new_disk_cloud_properties = @job.persistent_disk_pool ? @job.persistent_disk_pool.cloud_properties : {}
+        new_disk_size != disk_size || new_disk_cloud_properties != disk_cloud_properties
       end
 
       ##
@@ -397,12 +415,20 @@ module Bosh::Director
           'networks' => network_settings,
           'resource_pool' => job.resource_pool.spec,
           'packages' => job.package_spec,
-          'persistent_disk' => job.persistent_disk,
           'configuration_hash' => configuration_hash,
           'properties' => job.properties,
           'dns_domain_name' => dns_domain_name
         }
 
+        if job.persistent_disk_pool
+          # supply both for reverse compatibility with old agent
+          spec['persistent_disk'] = job.persistent_disk_pool.disk_size
+          # old agents will ignore this pool
+          spec['persistent_disk_pool'] = job.persistent_disk_pool.spec
+        else
+          spec['persistent_disk'] = 0
+        end
+
         if template_hashes
           spec['template_hashes'] = template_hashes
         end

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

@@ -25,8 +25,8 @@ module Bosh::Director
       # @return [String] Job canonical name (mostly for DNS)
       attr_accessor :canonical_name
 
-      # @return [Integer] Persistent disk size (no disk if zero)
-      attr_accessor :persistent_disk
+      # @return [DiskPool] Persistent disk pool (or nil)
+      attr_accessor :persistent_disk_pool
 
       # @return [DeploymentPlan] Current deployment plan
       attr_accessor :deployment
@@ -250,6 +250,13 @@ module Bosh::Director
         @lifecycle == 'errand'
       end
 
+      # reverse compatibility: translate disk size into a disk pool
+      def persistent_disk=(disk_size)
+        disk_pool = DiskPool.new(SecureRandom.uuid)
+        disk_pool.disk_size = disk_size
+        @persistent_disk_pool = disk_pool
+      end
+
       private
 
       # @param [Hash] collection All properties collection

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

@@ -146,7 +146,33 @@ module Bosh::Director
       end
 
       def parse_disk
-        @job.persistent_disk = safe_property(@job_spec, "persistent_disk", :class => Integer, :default => 0)
+        disk_size = safe_property(@job_spec, 'persistent_disk', :class => Integer, :optional => true)
+        disk_pool_name = safe_property(@job_spec, 'persistent_disk_pool', :class => String, :optional => true)
+
+        if disk_size && disk_pool_name
+          raise JobInvalidPersistentDisk,
+            "Job `#{@job.name}' references both a peristent disk size `#{disk_size}' " +
+              "and a peristent disk pool `#{disk_pool_name}'"
+        end
+
+        if disk_size
+          if disk_size < 0
+            raise JobInvalidPersistentDisk,
+              "Job `#{@job.name}' references an invalid peristent disk size `#{disk_size}'"
+          else
+            @job.persistent_disk = disk_size
+          end
+        end
+
+        if disk_pool_name
+          disk_pool = @deployment.disk_pool(disk_pool_name)
+          if disk_pool.nil?
+            raise JobUnknownDiskPool,
+                  "Job `#{@job.name}' references an unknown disk pool `#{disk_pool_name}'"
+          else
+            @job.persistent_disk_pool = disk_pool
+          end
+        end
       end
 
       def parse_properties

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

@@ -1,4 +1,5 @@
 require 'bosh/director/deployment_plan/deployment_spec_parser'
+require 'bosh/director/deployment_plan/disk_pool'
 
 module Bosh::Director
   # Encapsulates essential director data structures retrieved
@@ -68,6 +69,7 @@ module Bosh::Director
         @networks_canonical_name_index = Set.new
 
         @resource_pools = {}
+        @disk_pools = {}
 
         @jobs = []
         @jobs_name_index = {}
@@ -169,6 +171,24 @@ module Bosh::Director
         @resource_pools[name]
       end
 
+      # Adds a disk pool by name
+      # @param [Bosh::Director::DeploymentPlan::DiskPool] disk_pool
+      def add_disk_pool(disk_pool)
+        if @disk_pools[disk_pool.name]
+          raise DeploymentDuplicateDiskPoolName,
+            "Duplicate disk pool name `#{disk_pool.name}'"
+        end
+        @disk_pools[disk_pool.name] = disk_pool
+      end
+
+      def disk_pools
+        @disk_pools.values
+      end
+
+      def disk_pool(name)
+        @disk_pools[name]
+      end
+
       # Adds a release by name
       # @param [Bosh::Director::DeploymentPlan::ReleaseVersion] release
       def add_release(release)

data/lib/bosh/director/errors.rb

@@ -145,6 +145,8 @@ module Bosh::Director
   JobMissingNetwork = err(140007)
   JobInvalidTemplates = err(140008)
   JobInvalidLifecycle = err(140009)
+  JobUnknownDiskPool = err(140010)
+  JobInvalidPersistentDisk = err(140011)
 
   # Manifest parsing: job networks section
   JobUnknownNetwork = err(150001)
@@ -175,6 +177,9 @@ module Bosh::Director
   DeploymentCanonicalNameTaken = err(190008)
   DeploymentInvalidNetworkType = err(190009)
   DeploymentUnknownTemplate = err(190012)
+  DeploymentDuplicateDiskPoolName = err(190013)
+
+  DiskPoolInvalidDiskSize = err(200001)
 
   CloudDiskNotAttached = err(390001)
   CloudDiskMissing = err(390002)

data/lib/bosh/director/instance_updater.rb

@@ -66,7 +66,7 @@ module Bosh::Director
         return
       end
 
-      step { update_resource_pool(nil) }
+      step { recreate_vm(nil) }
       step { update_networks }
       step { update_dns }
       step { update_persistent_disk }
@@ -164,8 +164,14 @@ module Bosh::Director
       end
     end
 
-    def delete_disk(disk, vm_cid)
+    def delete_unused_disk(disk)
+      @cloud.delete_disk(disk.disk_cid)
+      disk.destroy
+    end
+
+    def delete_mounted_disk(disk)
       disk_cid = disk.disk_cid
+      vm_cid = @vm.cid
 
       # Unmount the disk only if disk is known by the agent
       if agent && disk_info.include?(disk_cid)
@@ -208,7 +214,7 @@ module Bosh::Director
       end
     end
 
-    def update_resource_pool(new_disk_cid)
+    def recreate_vm(new_disk_cid)
       @vm, @agent = vm_updater.update(new_disk_cid)
     end
 
@@ -237,51 +243,15 @@ module Bosh::Director
       vm_updater.attach_missing_disk
       check_persistent_disk
 
-      disk_cid = nil
       disk = nil
       return unless @instance.persistent_disk_changed?
 
       old_disk = @instance.model.persistent_disk
 
-      if @job.persistent_disk > 0
-        @instance.model.db.transaction do
-          disk_cid = @cloud.create_disk(@job.persistent_disk, @vm.cid)
-          disk =
-              Models::PersistentDisk.create(:disk_cid => disk_cid,
-                                            :active => false,
-                                            :instance_id => @instance.model.id,
-                                            :size => @job.persistent_disk)
-        end
-
-        begin
-          @cloud.attach_disk(@vm.cid, disk_cid)
-        rescue Bosh::Clouds::NoDiskSpace => e
-          if e.ok_to_retry
-            @logger.warn("Retrying attach disk operation " +
-                             "after persistent disk update failed")
-            # Recreate the vm
-            update_resource_pool(disk_cid)
-            begin
-              @cloud.attach_disk(@vm.cid, disk_cid)
-            rescue
-              @cloud.delete_disk(disk_cid)
-              disk.destroy
-              raise
-            end
-          else
-            @cloud.delete_disk(disk_cid)
-            disk.destroy
-            raise
-          end
-        end
-
-        begin
-          agent.mount_disk(disk_cid)
-          agent.migrate_disk(old_disk.disk_cid, disk_cid) if old_disk
-        rescue
-          delete_disk(disk, @vm.cid)
-          raise
-        end
+      if @job.persistent_disk_pool && @job.persistent_disk_pool.disk_size > 0
+        disk = create_disk
+        attach_disk(disk)
+        mount_and_migrate_disk(disk, old_disk)
       end
 
       @instance.model.db.transaction do
@@ -289,7 +259,7 @@ module Bosh::Director
         disk.update(:active => true) if disk
       end
 
-      delete_disk(old_disk, @vm.cid) if old_disk
+      delete_mounted_disk(old_disk) if old_disk
     end
 
     def update_networks
@@ -334,5 +304,50 @@ module Bosh::Director
       # which could be replaced after updating a VM
       VmUpdater.new(@instance, @vm, agent, @job_renderer, @cloud, 3, @logger)
     end
+
+    private
+
+    def create_disk
+      disk_size = @job.persistent_disk_pool.disk_size
+      cloud_properties = @job.persistent_disk_pool.cloud_properties
+
+      disk = nil
+      @instance.model.db.transaction do
+        disk_cid = @cloud.create_disk(disk_size, cloud_properties, @vm.cid)
+        disk = Models::PersistentDisk.create(
+          :disk_cid => disk_cid,
+          :active => false,
+          :instance_id => @instance.model.id,
+          :size => disk_size
+        )
+      end
+      disk
+    end
+
+    def attach_disk(disk)
+      @cloud.attach_disk(@vm.cid, disk.disk_cid)
+    rescue Bosh::Clouds::NoDiskSpace => e
+      if e.ok_to_retry
+        @logger.warn('Retrying attach disk operation after persistent disk update failed')
+        recreate_vm(disk.disk_cid)
+        begin
+          @cloud.attach_disk(@vm.cid, disk.disk_cid)
+        rescue
+          delete_unused_disk(disk)
+          raise
+        end
+      else
+        delete_unused_disk(disk)
+        raise
+      end
+    end
+
+    def mount_and_migrate_disk(new_disk, old_disk)
+      agent.mount_disk(new_disk.disk_cid)
+      agent.migrate_disk(old_disk.disk_cid, new_disk.disk_cid) if old_disk
+    rescue
+      delete_mounted_disk(new_disk)
+      raise
+    end
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2697.0'
+    VERSION = '1.2707.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -119,7 +119,7 @@ module Bosh
         write_agent_settings(agent_id, settings)
       end
 
-      def create_disk(size, vm_locality = nil)
+      def create_disk(size, cloud_properties, vm_locality = nil)
         disk_id = SecureRandom.hex
         file = disk_file(disk_id)
         FileUtils.mkdir_p(File.dirname(file))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2697.0
+  version: 1.2707.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,154 +30,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  ca0ac0
+  3e8bee
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -472,7 +472,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
 - bin/bosh-director
 - bin/bosh-director-console
 - bin/bosh-director-drain-workers
@@ -578,6 +577,7 @@ files:
 - lib/bosh/director/deployment_plan/compilation_config.rb
 - lib/bosh/director/deployment_plan/compiled_package.rb
 - lib/bosh/director/deployment_plan/deployment_spec_parser.rb
+- lib/bosh/director/deployment_plan/disk_pool.rb
 - lib/bosh/director/deployment_plan/dns_binder.rb
 - lib/bosh/director/deployment_plan/dynamic_network.rb
 - lib/bosh/director/deployment_plan/instance.rb

data/CHANGELOG

@@ -1,34 +0,0 @@
-== 0.7 - 12/07/12
-* Gem bumps:
- * Upgrade openstack_cpi gem to v0.0.4 and blobstore_client to v0.5.0 in director
- * Bump vSphere CPI versions in deployer and director.
- * Bump director vsphere_cpi
- * Bump vcloud_cpi version
- * Bump aws_cpi to 0.6.3
-* Rename soap log to cpi log
-* `bosh releases` shows which releases are in use
-* Improved DNS support
-* add director feature list to /info
-* Save properties from job spec on release upload
-* Filter job properties
-* Use common property helpers everywhere
-* Release Rebase improvements
-* Don't update task state when checkpointing
-* Persist VM env for cloudcheck
-* Trigger update when resource pool env changes
-* Fix InstanceDeleter unit test for 1.9.3.
-* Removed Lock.try_lock
-* CPI log exposed to all providers.
-* Reduce bosh vms timeout from 30 seconds to 5.
-* Add LockHelper.
-* Make release lock more granular in UpdateDeployment job.
-* Use new set_vm_metadata call.
-* Fix metadata_helper to use the deployment name.
-* Use migrations from the CPI gems.
-* Injecting vcloud_cpi dependencies into director
-
-== 0.6 - 08/29/12
-* release rebase support
-* fingerprint matching
-* updated VSphere CPI to 0.4.10 (vCPU fix)
-* removed compiled package sharing