bosh-director 1.3178.0 → 1.3181.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50418ce75a28cf747cafa90bd0233596b8d2fe1c
-  data.tar.gz: c4866efc86924bd8295b6707f97ebcd41ee36331
+  metadata.gz: c97780b3dff8eed73c5d5be903e89db7379d5783
+  data.tar.gz: b44b5e4a56222f11ebbd158edd38a4ee12d931c8
 SHA512:
-  metadata.gz: dabe39be4831b8f56640c70904dfc40b834d81e0fb8d28280654a411613a88402913385382a719b6f217d5938f1e6018313344669362f59e8add41a2104c6395
-  data.tar.gz: 855d438e111d8bc3412ebf9b9a5a52741a623c26061886a38ba3d80f9e0279713e78355f04b9151f91eff409b95fe1b61b5ef1919746afbdc514c5e5b6f4488e
+  metadata.gz: 9906d59e3d0f2b08d4dad7c5bc3de47fb01dc528506a7b8d662cb0b0c4e6724dbb2c5a90871d893bef2f8cbbd8c560545c9b6149e69753b7510a4a6ee9b846d2
+  data.tar.gz: 6c32ef7e74cb561aec71c44bd28ddb66bb178bca559cf9c092417bc18bece0d008b62c3bb67f49bb523cb01efa34d345fb35be0fcced1e753cf48fc10d280c02

data/lib/bosh/director.rb

@@ -92,6 +92,10 @@ require 'bosh/director/transactor'
 require 'bosh/director/sequel'
 require 'common/thread_pool'
 
+require 'bosh/director/manifest/manifest'
+require 'bosh/director/manifest/changeset'
+require 'bosh/director/manifest/diff_lines'
+
 require 'bosh/director/log_bundles_cleaner'
 require 'bosh/director/logs_fetcher'
 

data/lib/bosh/director/api/cloud_config_manager.rb

@@ -18,6 +18,10 @@ module Bosh
           list(1).first
         end
 
+        def find_by_id(id)
+          Bosh::Director::Models::CloudConfig.find(id: id)
+        end
+
         private
 
         def validate_manifest!(cloud_config)

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

@@ -205,7 +205,7 @@ module Bosh::Director
 
       post '/:deployment/properties', :consumes => [:json] do
         payload = json_decode(request.body)
-        @property_manager.create_property(params[:deployment], payload['name'], payload['value'])
+        @property_manager.create_property(params[:deployment], payload['name'], payload['value']  )
         status(204)
       end
 
@@ -267,12 +267,44 @@ module Bosh::Director
         options = {}
         options['recreate'] = true if params['recreate'] == 'true'
         options['skip_drain'] = params['skip_drain'] if params['skip_drain']
-        latest_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
+        if params['context']
+          @logger.debug("Deploying with context #{params['context']}")
+          context = JSON.parse(params['context'])
+          cloud_config = Api::CloudConfigManager.new.find_by_id(context['cloud_config_id'])
+        else
+          cloud_config =Api::CloudConfigManager.new.latest
+        end
 
-        task = @deployment_manager.create_deployment(current_user, request.body, latest_cloud_config, options)
+        task = @deployment_manager.create_deployment(current_user, request.body, cloud_config, options)
         redirect "/tasks/#{task.id}"
       end
 
+      post '/:deployment/diff', :consumes => :yaml do
+        deployment = Models::Deployment[name: params[:deployment]]
+        if deployment
+          before_manifest = Manifest.load_from_text(deployment.manifest, deployment.cloud_config)
+          before_manifest.resolve_aliases
+        else
+          before_manifest = Manifest.load_from_text(nil, nil)
+        end
+
+        after_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
+        after_manifest = Manifest.load_from_text(
+          request.body,
+          after_cloud_config
+        )
+        after_manifest.resolve_aliases
+
+        diff = before_manifest.diff(after_manifest)
+
+        json_encode({
+          'context' => {
+            'cloud_config_id' => after_cloud_config ? after_cloud_config.id : nil,
+          },
+          'diff' => diff.map { |l| [l.to_s, l.status] }
+        })
+      end
+
       post '/:deployment_name/errands/:errand_name/runs' do
         deployment_name = params[:deployment_name]
         errand_name = params[:errand_name]

data/lib/bosh/director/api/release_manager.rb

@@ -5,23 +5,7 @@ module Bosh::Director
 
       def get_all_releases
         releases = Models::Release.order_by(:name.asc).map do |release|
-          sorted_version_tuples = release.versions_dataset.all.map do |version|
-            {
-              provided: version,
-              parsed: Bosh::Common::Version::ReleaseVersion.parse(version.values[:version])
-            }
-          end.sort_by { |rv| rv[:parsed] }
-          release_versions = sorted_version_tuples.map do |version|
-            provided = version[:provided]
-            {
-              'version' => provided.version.to_s,
-              'commit_hash' => provided.commit_hash,
-              'uncommitted_changes' => provided.uncommitted_changes,
-              'currently_deployed' => !provided.deployments.empty?,
-              'job_names' => provided.templates.map(&:name),
-            }
-          end
-
+          release_versions = sorted_release_versions(release)
           {
             'name' => release.name,
             'release_versions' => release_versions
@@ -31,6 +15,27 @@ module Bosh::Director
         releases
       end
 
+      def sorted_release_versions(release)
+        sorted_version_tuples = release.versions_dataset.all.map do |version|
+          {
+            provided: version,
+            parsed: Bosh::Common::Version::ReleaseVersion.parse(version.values[:version])
+          }
+        end.sort_by { |rv| rv[:parsed] }
+        release_versions = sorted_version_tuples.map do |version|
+          provided = version[:provided]
+          {
+            'version' => provided.version.to_s,
+            'commit_hash' => provided.commit_hash,
+            'uncommitted_changes' => provided.uncommitted_changes,
+            'currently_deployed' => !provided.deployments.empty?,
+            'job_names' => provided.templates.map(&:name),
+          }
+        end
+
+        release_versions
+      end
+
       def find_by_name(name)
         release = Models::Release[:name => name]
         if release.nil?

data/lib/bosh/director/config.rb

@@ -303,6 +303,25 @@ module Bosh::Director
         Thread.current[:bosh] ||= {}
       end
 
+      def generate_temp_dir
+        temp_dir = Dir.mktmpdir
+        ENV["TMPDIR"] = temp_dir
+        FileUtils.mkdir_p(temp_dir)
+        at_exit do
+          begin
+            if $!
+              status = $!.is_a?(::SystemExit) ? $!.status : 1
+            else
+              status = 0
+            end
+            FileUtils.rm_rf(temp_dir)
+          ensure
+            exit status
+          end
+        end
+        temp_dir
+      end
+
       def patch_sqlite
         return if @patched_sqlite
         @patched_sqlite = true

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

@@ -26,7 +26,12 @@ module Bosh::Director
         rescue => e
           unless instance.nil? || instance_plan.nil?
             @instance_reuser.remove_instance(instance)
-            delete_instance(instance_plan)
+
+            if Config.keep_unreachable_vms
+              @logger.info('Keeping reused compilation VM for debugging')
+            else
+              delete_instance(instance_plan)
+            end
           end
           raise e
         end
@@ -34,11 +39,18 @@ module Bosh::Director
 
       def with_single_use_vm(stemcell)
         begin
+          keep_failing_vm = false
           instance_plan, instance = create_instance_plan(stemcell)
           configure_instance_plan(instance_plan)
           yield instance
+        rescue => e
+          @logger.info('Keeping single-use compilation VM for debugging')
+          keep_failing_vm = Config.keep_unreachable_vms
+          raise e
         ensure
-          delete_instance(instance_plan) unless instance.nil?
+          unless instance.nil? || keep_failing_vm
+            delete_instance(instance_plan)
+          end
         end
       end
 

data/lib/bosh/director/deployment_plan/ip_provider/in_memory_ip_repo.rb

@@ -29,9 +29,9 @@ module Bosh::Director::DeploymentPlan
     end
 
     def allocate_dynamic_ip(reservation, subnet)
-      item = (0...subnet.range.size).find { |i| available_for_dynamic?(subnet.range[i], subnet) }
-
       @mutex.synchronize do
+        item = (0...subnet.range.size).find { |i| available_for_dynamic?(subnet.range[i], subnet) }
+
         if item.nil?
           entry = @recently_released_ips.find do |entry|
             entry[:network_name] == subnet.network_name && subnet.range.contains?(entry[:ip])
@@ -72,11 +72,8 @@ module Bosh::Director::DeploymentPlan
       return false unless subnet.range.contains?(ip)
       return false if subnet.static_ips.include?(ip.to_i)
       return false if subnet.restricted_ips.include?(ip.to_i)
-
-      @mutex.synchronize do
-        return false if @recently_released_ips.include?({ip: ip.to_i, network_name: subnet.network_name})
-        return false if @ips.include?({ip: ip.to_i, network_name: subnet.network_name})
-      end
+      return false if @recently_released_ips.include?({ip: ip.to_i, network_name: subnet.network_name})
+      return false if @ips.include?({ip: ip.to_i, network_name: subnet.network_name})
 
       true
     end

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

@@ -33,21 +33,20 @@ module Bosh
         end
 
         def create_from_model(deployment_model, options={})
-          manifest_hash = Psych.load(deployment_model.manifest)
-          cloud_config_model = deployment_model.cloud_config
-          create_from_manifest(manifest_hash, cloud_config_model, options)
+          manifest = Manifest.load_from_text(deployment_model.manifest, deployment_model.cloud_config)
+          create_from_manifest(manifest, deployment_model.cloud_config, options)
         end
 
-        def create_from_manifest(manifest_hash, cloud_config, options)
-          parse_from_manifest(manifest_hash, cloud_config, options)
+        def create_from_manifest(manifest, cloud_config, options)
+          parse_from_manifest(manifest, cloud_config, options)
         end
 
         private
 
-        def parse_from_manifest(manifest_hash, cloud_config, options)
-          cloud_config_hash = cloud_config.nil? ? nil : cloud_config.manifest
-          @manifest_validator.validate(manifest_hash, cloud_config_hash)
-          deployment_manifest, cloud_manifest = @deployment_manifest_migrator.migrate(manifest_hash, cloud_config_hash)
+        def parse_from_manifest(manifest, cloud_config, options)
+          manifest.resolve_aliases
+          @manifest_validator.validate(manifest.manifest_hash, manifest.cloud_config_hash)
+          deployment_manifest, cloud_manifest = @deployment_manifest_migrator.migrate(manifest.manifest_hash, manifest.cloud_config_hash)
           @logger.debug("Migrated deployment manifest:\n#{deployment_manifest}")
           @logger.debug("Migrated cloud config manifest:\n#{cloud_manifest}")
           name = deployment_manifest['name']

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

@@ -38,10 +38,6 @@ module Bosh::Director
         @model = nil
       end
 
-      def is_using_latest_version?
-        @version == 'latest'
-      end
-
       def is_using_os?
         !@os.nil? && @name.nil?
       end
@@ -62,13 +58,9 @@ module Bosh::Director
       end
 
       def add_stemcell_model
-        if is_using_latest_version?
-          @model = is_using_os? ? @manager.latest_by_os(@os) : @manager.latest_by_name(@name)
-        else
-          @model = is_using_os? ?
-            @manager.find_by_os_and_version(@os, @version) :
-            @manager.find_by_name_and_version(@name, @version)
-        end
+        @model = is_using_os? ?
+          @manager.find_by_os_and_version(@os, @version) :
+          @manager.find_by_name_and_version(@name, @version)
 
         @name = @model.name
         @os = @model.operating_system

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

@@ -23,18 +23,16 @@ module Bosh::Director
 
     def perform
       deployment_model = @deployment_manager.find_by_name(@deployment_name)
-      deployment_manifest_hash = Psych.load(deployment_model.manifest)
-      deployment_name = deployment_manifest_hash['name']
+      deployment_manifest = Manifest.load_from_text(deployment_model.manifest, deployment_model.cloud_config)
+      deployment_name = deployment_manifest.to_hash['name']
       with_deployment_lock(deployment_name) do
-        cloud_config_model = deployment_model.cloud_config
-
         deployment = nil
         job = nil
 
         event_log.begin_stage('Preparing deployment', 1)
         event_log.track('Preparing deployment') do
           planner_factory = DeploymentPlan::PlannerFactory.create(logger)
-          deployment = planner_factory.create_from_manifest(deployment_manifest_hash, cloud_config_model, {})
+          deployment = planner_factory.create_from_manifest(deployment_manifest, deployment_model.cloud_config, {})
           deployment.bind_models
           job = deployment.job(@errand_name)
 

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

@@ -21,8 +21,6 @@ module Bosh::Director
 
         manifest_text = File.read(@manifest_file_path)
         logger.debug("Manifest:\n#{manifest_text}")
-        deployment_manifest_hash = Psych.load(manifest_text)
-
         cloud_config_model = Bosh::Director::Models::CloudConfig[@cloud_config_id]
         if cloud_config_model.nil?
           logger.debug("No cloud config uploaded yet.")
@@ -30,7 +28,8 @@ module Bosh::Director
           logger.debug("Cloud config:\n#{cloud_config_model.manifest}")
         end
 
-        deployment_name = deployment_manifest_hash['name']
+        deployment_manifest = Manifest.load_from_text(manifest_text, cloud_config_model)
+        deployment_name = deployment_manifest.to_hash['name']
         with_deployment_lock(deployment_name) do
           @notifier = DeploymentPlan::Notifier.new(deployment_name, Config.nats_rpc, logger)
           @notifier.send_start_event
@@ -40,7 +39,7 @@ module Bosh::Director
           event_log.begin_stage('Preparing deployment', 1)
           event_log.track('Preparing deployment') do
             planner_factory = DeploymentPlan::PlannerFactory.create(logger)
-            deployment_plan = planner_factory.create_from_manifest(deployment_manifest_hash, cloud_config_model, @options)
+            deployment_plan = planner_factory.create_from_manifest(deployment_manifest, cloud_config_model, @options)
             deployment_plan.bind_models
           end
 

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

@@ -0,0 +1,115 @@
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end
+
+module Bosh::Director
+  class Changeset
+    KEY_NAME = 'name'
+
+    def initialize(before, after)
+      @before = before
+      @after = after
+      if @before && @after
+        @merged = @before.deep_merge(@after)
+      elsif @before
+        @merged = @before
+      else
+        @merged = @after
+      end
+    end
+
+    def diff(indent = 0)
+      lines = DiffLines.new
+
+      @merged.each_pair do |key, value|
+        if @before.nil? || @before[key].nil?
+          lines.concat(yaml_lines({key => value}, indent, 'added'))
+
+        elsif @after.nil? || @after[key].nil?
+          lines.concat(yaml_lines({key => value}, indent, 'removed'))
+
+        elsif @before[key].is_a?(Array) && @after[key].is_a?(Array)
+          lines.concat(compare_arrays(@before[key], @after[key], key, indent))
+
+        elsif value.is_a?(Hash)
+          changeset = Changeset.new(@before[key], @after[key])
+          diff_lines = changeset.diff(indent+1)
+          unless diff_lines.empty?
+            lines << Line.new(indent, "#{key}:", nil)
+            lines.concat(diff_lines)
+          end
+
+        elsif @before[key] != @after[key]
+          lines << Line.new(indent, "#{key}: #{@before[key]}", 'removed')
+          lines << Line.new(indent, "#{key}: #{@after[key]}", 'added')
+        end
+      end
+      lines
+    end
+
+    def yaml_lines(value, indent, state)
+      lines = DiffLines.new
+      value.to_yaml(indent: Line::INDENT).gsub("---\n", '').split("\n").each do |line|
+        lines << Line.new(indent, line, state)
+      end
+      lines
+    end
+
+    def compare_arrays(old_value, new_value, parent_name, indent)
+      added = new_value - old_value
+      removed = old_value - new_value
+
+      lines = DiffLines.new
+
+      added.each do |elem|
+        if elem.is_a?(Hash)
+          using_names = (added+removed).all? { |e| e['name'] }
+          using_ranges = (added+removed).all? { |e| e['range'] }
+          if using_names || using_ranges
+            if using_names
+              removed_same_name_element = removed.find { |e| e['name'] == elem['name'] }
+            elsif using_ranges
+              removed_same_name_element = removed.find { |e| e['range'] == elem['range'] }
+            end
+            removed.delete(removed_same_name_element)
+
+            if removed_same_name_element
+              changeset = Changeset.new(removed_same_name_element, elem)
+              diff_lines = changeset.diff(indent+1)
+
+              unless diff_lines.empty?
+                # write name if elem has been changed
+                if using_names
+                  lines.concat(yaml_lines([{'name' => elem['name']}], indent, nil))
+                elsif using_ranges
+                  lines.concat(yaml_lines([{'range' => elem['range']}], indent, nil))
+                end
+                lines.concat(diff_lines)
+              end
+            else
+              lines.concat(yaml_lines([elem], indent, 'added'))
+            end
+
+          else
+            lines.concat(yaml_lines([elem], indent, 'added'))
+          end
+        else
+          lines.concat(yaml_lines([elem], indent, 'added'))
+        end
+      end
+
+      unless removed.empty?
+        lines.concat(yaml_lines(removed, indent, 'removed'))
+      end
+
+      unless lines.empty?
+        lines.unshift(Line.new(indent, "#{parent_name}:", nil))
+      end
+
+      lines
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+module Bosh::Director
+  class Line < Struct.new(:indent, :text, :status)
+    INDENT = 2
+
+    def to_s
+      "#{' ' * INDENT * indent}#{text}"
+    end
+
+    def full_indent
+      indent + text[/^ */].size / INDENT
+    end
+  end
+
+  class DiffLines < Array
+    MANIFEST_KEYS_ORDER = %w(
+      azs
+      vm_types
+      resource_pools
+      compilation
+      networks
+      disk_types
+      disk_pools
+      name
+      director_uuid
+      stemcells
+      releases
+      update
+      jobs
+    )
+
+    def order
+      sections = {}
+      key = nil
+
+      self.each do |line|
+        if line.indent == 0 && line.text !~ /^[ -]/
+          key = line.text
+          sections[key] = []
+        end
+
+        sections[key] << line
+      end
+
+      ordered_lines = []
+      MANIFEST_KEYS_ORDER.each do |manifest_key|
+        section_name = manifest_key + ':'
+        lines = sections[section_name]
+        ordered_lines += lines.to_a
+        sections.delete(section_name)
+      end
+
+      sections.each do |_, section_lines|
+        section_lines.each do |line|
+          ordered_lines << line
+        end
+      end
+
+      self.replace(ordered_lines)
+    end
+
+    def redact_properties
+      i = 0
+      while i < self.size
+        line = self[i]
+
+        if line.text =~ /\bproperties:/
+          properties_indent = line.full_indent
+          i += 1
+          line = self[i]
+
+          while line && line.full_indent > properties_indent
+            line.text.gsub!(/: .+/, ': <redacted>') # readact hash values
+            line.text.gsub!(/- [^:]+$/, '- <redacted>') # redact array values
+            i += 1
+            line = self[i]
+          end
+        end
+        i += 1
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+module Bosh::Director
+  class Manifest
+    def self.load_from_text(manifest_text, cloud_config)
+      cloud_config_hash =  cloud_config.nil? ? nil : cloud_config.manifest
+      manifest_hash = manifest_text.nil? ? {} : Psych.load(manifest_text)
+      new(manifest_hash, cloud_config_hash)
+    end
+
+    attr_reader :manifest_hash, :cloud_config_hash
+
+    def initialize(manifest_hash, cloud_config_hash)
+      @manifest_hash = manifest_hash
+      @cloud_config_hash = cloud_config_hash
+    end
+
+    def resolve_aliases
+      hashed = to_hash
+      hashed['resource_pools'].to_a.each do |rp|
+        rp['stemcell']['version'] = resolve_stemcell_version(rp['stemcell'])
+      end
+
+      hashed['stemcells'].to_a.each do |stemcell|
+        stemcell['version'] = resolve_stemcell_version(stemcell)
+      end
+
+      hashed['releases'].to_a.each do |release|
+        release['version'] = resolve_release_version(release)
+      end
+    end
+
+    def diff(other_manifest)
+      Changeset.new(to_hash, other_manifest.to_hash).diff.order.redact_properties
+    end
+
+    def to_hash
+      @manifest_hash.merge(@cloud_config_hash || {})
+    end
+
+    private
+
+    def resolve_stemcell_version(stemcell)
+      stemcell_manager = Api::StemcellManager.new
+
+      unless stemcell.is_a?(Hash)
+        raise 'Invalid stemcell spec in the deployment manifest'
+      end
+
+      if stemcell['version'] == 'latest'
+        if stemcell['os']
+          latest_stemcell = stemcell_manager.latest_by_os(stemcell['os'])
+        elsif stemcell['name']
+          latest_stemcell = stemcell_manager.latest_by_name(stemcell['name'])
+        else
+          raise 'Stemcell definition must contain either name or os'
+        end
+        return latest_stemcell[:version].to_s
+      end
+
+      stemcell['version'].to_s
+    end
+
+    def resolve_release_version(release_def)
+      release_manager = Api::ReleaseManager.new
+      if release_def['version'] == 'latest'
+        release = release_manager.find_by_name(release_def['name'])
+        return release_manager.sorted_release_versions(release).last['version']
+      end
+
+      release_def['version'].to_s
+    end
+  end
+end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3178.0'
+    VERSION = '1.3181.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3178.0
+  version: 1.3181.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -874,6 +874,9 @@ files:
 - lib/bosh/director/lock_helper.rb
 - lib/bosh/director/log_bundles_cleaner.rb
 - lib/bosh/director/logs_fetcher.rb
+- lib/bosh/director/manifest/changeset.rb
+- lib/bosh/director/manifest/diff_lines.rb
+- lib/bosh/director/manifest/manifest.rb
 - lib/bosh/director/models.rb
 - lib/bosh/director/models/cloud_config.rb
 - lib/bosh/director/models/compiled_package.rb