bosh-director 1.1868.0 → 1.1975.0

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

@@ -69,8 +69,8 @@ module Bosh::Director
       # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
       # @param [Hash] job_spec Raw job spec from the deployment manifest
       # @return [Bosh::Director::DeploymentPlan::Job]
-      def self.parse(deployment, job_spec)
-        job_parser = JobSpecParser.new(deployment)
+      def self.parse(deployment, job_spec, event_log)
+        job_parser = JobSpecParser.new(deployment, event_log)
         job_parser.parse(job_spec)
       end
 

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

@@ -9,8 +9,9 @@ module Bosh::Director
       include IpUtil
 
       # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
-      def initialize(deployment)
+      def initialize(deployment, event_log)
         @deployment = deployment
+        @event_log = event_log
       end
 
       # @param [Hash] job_spec Raw job spec from the deployment manifest
@@ -64,6 +65,12 @@ module Bosh::Director
       def parse_template
         template_names = safe_property(@job_spec, "template", optional: true)
         if template_names
+          if template_names.is_a?(Array)
+            @event_log.warn_deprecated(
+              "Please use `templates' when specifying multiple templates for a job. "\
+              "`template' for multiple templates will soon be unsupported."
+            )
+          end
           if template_names.is_a?(String)
             template_names = Array(template_names)
           end

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

@@ -41,7 +41,7 @@ module Bosh::Director
         @model = nil
       end
 
-      def parse
+      def parse(event_log)
         parse_name
         parse_properties
         parse_releases
@@ -49,7 +49,7 @@ module Bosh::Director
         parse_compilation
         parse_update
         parse_resource_pools
-        parse_jobs
+        parse_jobs(event_log)
       end
 
       # Looks up deployment model in DB or creates one if needed
@@ -208,7 +208,7 @@ module Bosh::Director
         # raise "No resource pools specified." if @resource_pools.empty?
       end
 
-      def parse_jobs
+      def parse_jobs(event_log)
         @jobs = []
         @jobs_name_index = {}
         @jobs_canonical_name_index = Set.new
@@ -228,7 +228,7 @@ module Bosh::Director
                     'deployment manifest'
           end
 
-          job = Job.parse(self, job)
+          job = Job.parse(self, job, event_log)
 
           if @jobs_canonical_name_index.include?(job.canonical_name)
             raise DeploymentCanonicalJobNameTaken,

data/lib/bosh/director/event_log.rb

@@ -36,6 +36,14 @@ module Bosh::Director
         @last_stage.advance_and_track(task_name, &blk)
       end
 
+      def warn_deprecated(message)
+        log_entry(
+          'time' => 0,
+          'type' => 'deprecation',
+          'message' => message,
+        )
+      end
+
       # Adds an error entry to the event log.
       # @param [DirectorError] error Director error
       # @return [void]

data/lib/bosh/director/job_renderer.rb

@@ -7,12 +7,12 @@ module Bosh::Director
     def initialize(job)
       @job = job
       job_template_loader = Core::Templates::JobTemplateLoader.new(Config.logger)
-      @instance_renderer = Core::Templates::JobInstanceRenderer.new(@job, job_template_loader)
+      @instance_renderer = Core::Templates::JobInstanceRenderer.new(@job.templates, job_template_loader)
     end
 
     def render_job_instances(blobstore)
       @job.instances.each do |instance|
-        rendered_job_instance = @instance_renderer.render(instance)
+        rendered_job_instance = @instance_renderer.render(instance.spec)
 
         configuration_hash = rendered_job_instance.configuration_hash
 

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

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

data/lib/bosh/director/problem_resolver.rb

@@ -26,44 +26,21 @@ module Bosh::Director
 
     def apply_resolutions(resolutions)
       @resolutions = resolutions
-      problems = Models::DeploymentProblem.filter(deployment: @deployment, state: 'open').all
-      problem_ids = Set.new
+      problems = Models::DeploymentProblem.where(id: resolutions.keys)
 
-      problems.each do |problem|
-        problem_ids << problem.id.to_s
-        unless @resolutions.has_key?(problem.id.to_s)
-          raise CloudcheckResolutionNotProvided,
-                "Resolution for problem #{problem.id} (#{problem.type}) is not provided"
-        end
-      end
+      begin_stage('Applying problem resolutions', problems.count)
 
-      # We might have some resolutions for problems that are no longer open
-      # or just some bogus problem ids, in that case we still need to mention
-      # them in event log so end user understands what actually happened.
-      missing_problem_ids = @resolutions.keys.to_set - problem_ids
-
-      begin_stage("Applying problem resolutions", problems.size + missing_problem_ids.size)
       problems.each do |problem|
-        apply_resolution(problem)
-      end
+        if problem.state != 'open'
+          reason = "state is '#{problem.state}'"
+          track_and_log("Ignoring problem #{problem.id} (#{reason})")
+        elsif problem.deployment_id != @deployment.id
+          reason = 'not a part of this deployment'
+          track_and_log("Ignoring problem #{problem.id} (#{reason})")
 
-      missing_problem_ids.each do |problem_id|
-        if problem_id !~ /^\d+$/
-          reason = "malformed id"
         else
-          problem = Models::DeploymentProblem[problem_id.to_i]
-          if problem.nil?
-            reason = "not found"
-          elsif problem.state != "open"
-            reason = "state is '#{problem.state}'"
-          elsif problem.deployment_id != @deployment.id
-            reason = "not a part of this deployment"
-          else
-            reason = "reason unknown"
-          end
+          apply_resolution(problem)
         end
-
-        track_and_log("Ignoring problem #{problem_id} (#{reason})") { }
       end
       @resolved_count
     end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1868.0'
+    VERSION = '1.1975.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1868.0
+  version: 1.1975.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-12 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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.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.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -477,7 +477,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  f69423'
+  9c66c4'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -722,7 +722,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2788441104523827358
+      hash: 396729707528319626
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23