bosh-director 1.2957.0 → 1.2962.0

data/lib/bosh/director/models/deployment.rb

@@ -3,7 +3,6 @@
 module Bosh::Director::Models
   class Deployment < Sequel::Model(Bosh::Director::Config.db)
     many_to_many :stemcells
-    many_to_many :releases
     many_to_many :release_versions
     one_to_many  :job_instances, :class => "Bosh::Director::Models::Instance"
     one_to_many  :vms

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2957.0'
+    VERSION = '1.2962.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2957.0
+  version: 1.2962.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2957.0
+        version: 1.2962.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -558,7 +558,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  c9cf4f
+  74c57f
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -682,8 +682,10 @@ files:
 - lib/bosh/director/db_backup/error.rb
 - lib/bosh/director/deployment_plan.rb
 - lib/bosh/director/deployment_plan/assembler.rb
+- lib/bosh/director/deployment_plan/cloud_manifest_parser.rb
 - lib/bosh/director/deployment_plan/compilation_config.rb
 - lib/bosh/director/deployment_plan/compiled_package.rb
+- lib/bosh/director/deployment_plan/deployment_repo.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
@@ -692,18 +694,19 @@ files:
 - lib/bosh/director/deployment_plan/instance_vm_binder.rb
 - lib/bosh/director/deployment_plan/job.rb
 - lib/bosh/director/deployment_plan/job_spec_parser.rb
+- lib/bosh/director/deployment_plan/manifest_migrator.rb
 - lib/bosh/director/deployment_plan/manual_network.rb
 - lib/bosh/director/deployment_plan/multi_job_updater.rb
 - lib/bosh/director/deployment_plan/network.rb
 - lib/bosh/director/deployment_plan/network_subnet.rb
 - lib/bosh/director/deployment_plan/notifier.rb
 - lib/bosh/director/deployment_plan/planner.rb
+- lib/bosh/director/deployment_plan/planner_factory.rb
 - lib/bosh/director/deployment_plan/release_version.rb
 - lib/bosh/director/deployment_plan/resource_pool.rb
 - lib/bosh/director/deployment_plan/resource_pools.rb
 - lib/bosh/director/deployment_plan/stemcell.rb
 - lib/bosh/director/deployment_plan/steps/package_compile_step.rb
-- lib/bosh/director/deployment_plan/steps/prepare_step.rb
 - lib/bosh/director/deployment_plan/steps/update_step.rb
 - lib/bosh/director/deployment_plan/template.rb
 - lib/bosh/director/deployment_plan/update_config.rb
@@ -714,7 +717,6 @@ files:
 - lib/bosh/director/duration.rb
 - lib/bosh/director/encryption_helper.rb
 - lib/bosh/director/errand.rb
-- lib/bosh/director/errand/deployment_preparer.rb
 - lib/bosh/director/errand/job_manager.rb
 - lib/bosh/director/errand/result.rb
 - lib/bosh/director/errand/runner.rb

data/lib/bosh/director/deployment_plan/steps/prepare_step.rb

@@ -1,56 +0,0 @@
-module Bosh::Director
-  module DeploymentPlan
-    module Steps
-      class PrepareStep
-        def initialize(job, assembler)
-          @job = job
-          @assembler = assembler
-        end
-
-        def perform
-          job.begin_stage('Preparing deployment', 9)
-
-          job.track_and_log('Binding deployment') do
-            @assembler.bind_deployment
-          end
-
-          job.track_and_log('Binding releases') do
-            @assembler.bind_releases
-          end
-
-          job.track_and_log('Binding existing deployment') do
-            @assembler.bind_existing_deployment
-          end
-
-          job.track_and_log('Binding resource pools') do
-            @assembler.bind_resource_pools
-          end
-
-          job.track_and_log('Binding stemcells') do
-            @assembler.bind_stemcells
-          end
-
-          job.track_and_log('Binding templates') do
-            @assembler.bind_templates
-          end
-
-          job.track_and_log('Binding properties') do
-            @assembler.bind_properties
-          end
-
-          job.track_and_log('Binding unallocated VMs') do
-            @assembler.bind_unallocated_vms
-          end
-
-          job.track_and_log('Binding instance networks') do
-            @assembler.bind_instance_networks
-          end
-        end
-
-        private
-
-        attr_reader :job
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module Bosh::Director
-  class Errand::DeploymentPreparer
-
-    def initialize(deployment, job, event_log, base_job)
-      @deployment = deployment
-      @job = job
-      @event_log = event_log
-      @base_job = base_job
-    end
-
-    def prepare_deployment
-      assembler = DeploymentPlan::Assembler.new(@deployment)
-
-      preparer = DeploymentPlan::Steps::PrepareStep.new(@base_job, assembler)
-      preparer.perform
-
-      compiler = DeploymentPlan::Steps::PackageCompileStep.new(@deployment)
-      compiler.perform
-    end
-
-    def prepare_job
-      @job.bind_unallocated_vms
-      @job.bind_instance_networks
-    end
-  end
-end