bosh-director 1.5.0.pre.1435 → 1.5.0.pre.1436

data/lib/bosh/director/deployment_plan.rb

@@ -10,6 +10,7 @@ require 'bosh/director/deployment_plan/job'
 require 'bosh/director/deployment_plan/network'
 require 'bosh/director/deployment_plan/network_subnet'
 require 'bosh/director/deployment_plan/compiled_package'
+require 'bosh/director/deployment_plan/rendered_templates_archive'
 require 'bosh/director/deployment_plan/preparer'
 require 'bosh/director/deployment_plan/resource_pools'
 require 'bosh/director/deployment_plan/updater'

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

@@ -1,8 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DeploymentPlan
-    ##
     # Represents a single job instance.
     class Instance
       include DnsHelper
@@ -19,9 +16,12 @@ module Bosh::Director
       # @return [String] Checksum all of the configuration templates
       attr_accessor :configuration_hash
 
-      # @return [Hash] A hash of template SHA1 hashes.
+      # @return [Hash] A hash of template SHA1 hashes
       attr_accessor :template_hashes
 
+      # @return [DeploymentPlan::RenderedTemplatesArchive]
+      attr_accessor :rendered_templates_archive
+
       # @return [Hash<String, NetworkReservation>] network reservations
       attr_accessor :network_reservations
 
@@ -361,6 +361,13 @@ module Bosh::Director
           spec['template_hashes'] = template_hashes
         end
 
+        # Ruby BOSH Agent does not look at 'rendered_templates_archive'
+        # since it renders job templates and then compares template hashes.
+        # Go BOSH Agent has no ability to render ERB so pre-rendered templates are provided.
+        if rendered_templates_archive
+          spec['rendered_templates_archive'] = rendered_templates_archive.spec
+        end
+
         spec
       end
 

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

@@ -0,0 +1,14 @@
+module Bosh::Director::DeploymentPlan
+  class RenderedTemplatesArchive
+    attr_reader :blobstore_id, :sha1
+
+    def initialize(blobstore_id, sha1)
+      @blobstore_id = blobstore_id
+      @sha1 = sha1
+    end
+
+    def spec
+      { 'blobstore_id' => @blobstore_id, 'sha1' => @sha1 }
+    end
+  end
+end

data/lib/bosh/director/rendered_job_templates_persister.rb

@@ -9,10 +9,15 @@ module Bosh::Director
     end
 
     def persist(instance, rendered_job_templates)
-      current_archive = instance.model.latest_rendered_templates_archive
-      if !current_archive || current_archive.content_sha1 != instance.configuration_hash
-        persist_without_checking(instance, rendered_job_templates)
+      archive_model = instance.model.latest_rendered_templates_archive
+
+      if !archive_model || archive_model.content_sha1 != instance.configuration_hash
+        archive_model = persist_without_checking(instance, rendered_job_templates)
       end
+
+      instance.rendered_templates_archive =
+        DeploymentPlan::RenderedTemplatesArchive.new(
+          archive_model.blobstore_id, archive_model.sha1)
     end
 
     def persist_without_checking(instance, rendered_job_templates)

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1435'
+    VERSION = '1.5.0.pre.1436'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1435
+  version: 1.5.0.pre.1436
   prerelease: 6
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1435
+        version: 1.5.0.pre.1436
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  496235'
+  7ece07'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -575,6 +575,7 @@ files:
 - lib/bosh/director/deployment_plan/planner.rb
 - lib/bosh/director/deployment_plan/preparer.rb
 - lib/bosh/director/deployment_plan/release_version.rb
+- lib/bosh/director/deployment_plan/rendered_templates_archive.rb
 - lib/bosh/director/deployment_plan/resource_pool.rb
 - lib/bosh/director/deployment_plan/resource_pools.rb
 - lib/bosh/director/deployment_plan/stemcell.rb