bosh-director 1.3008.0 → 1.3010.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6fa18d5307ac8eea26fb86273257a05d6e0edad
-  data.tar.gz: 6e46d6b78536fecf443426d2c0eb1cb974d14140
+  metadata.gz: b7440bb5c715a87559c7e85a3589112ae363aab3
+  data.tar.gz: 80ff5c4ae767140b2e667976fd7f275c92514ac8
 SHA512:
-  metadata.gz: a4a65aed66263dc6ce7c757a688a42ac24946d0f77813acf21a6aaa1a10368cb09a4962d3bce0cb3cb83575331d3862ac7f39ceafaad90f7cbcbaa5f62dd1354
-  data.tar.gz: b5bb429aa4467bb3e79b0b2cb5ef03e5d110546c2ebb3cd40cc439f80acd018ec8dba1b6973bdee8319797f1b52001bf0118d032911deddd45ffdb67148b3dab
+  metadata.gz: 9d7f086a7fc1aeed44528a34dec18617bd6997276190db8b81d2940478db3a2934792954a675844d69daf48918f9e6b8ea0d78c91ec85fdf0e963179cbe9fd1f
+  data.tar.gz: 0455fd62dc5e4c7ca0762233a9ad5f5377b755af45d18264a685a31c8acc998175d0b196cadfc04fca9cf793398994add8c380b5972e92b6bfb20d3736db0ee1

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

@@ -67,7 +67,7 @@ module Bosh::Director
         }
 
         deployment = @deployment_manager.find_by_name(params[:deployment])
-        manifest = request.content_length.nil? ? StringIO.new(deployment.manifest) : request.body
+        manifest = (request.content_length.nil?  || request.content_length == 0) ? StringIO.new(deployment.manifest) : request.body
         latest_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
         task = @deployment_manager.create_deployment(current_user, manifest, latest_cloud_config, options)
         redirect "/tasks/#{task.id}"

data/lib/bosh/director/errors.rb

@@ -114,6 +114,7 @@ module Bosh::Director
   JobIncompatibleSpecs = err(80010)
   JobPackageCollision = err(80011)
   JobInvalidPackageSpec = err(80012)
+  JobInvalidLinkSpec = err(80013)
 
   ResourceError = err(100001)
   ResourceNotFound = err(100002, NOT_FOUND)

data/lib/bosh/director/jobs/release/release_job.rb

@@ -0,0 +1,159 @@
+module Bosh::Director
+  class ReleaseJob
+    def initialize(job_meta, release_model, release_dir, packages, logger)
+      @name = job_meta['name']
+      @version = job_meta['version']
+      @sha1 = job_meta['sha1']
+      @fingerprint = job_meta['fingerprint']
+
+      @packages = packages
+      @release_model = release_model
+      @release_dir = release_dir
+      @logger = logger
+    end
+
+    def create
+      template = create_template
+      unpack
+
+      job_manifest = load_manifest
+      validate_templates(job_manifest)
+      validate_monit
+
+      template.blobstore_id = BlobUtil.create_blob(job_tgz)
+      template.package_names = parse_package_names(job_manifest)
+
+      validate_logs(job_manifest)
+      template.logs = job_manifest['logs'] if job_manifest['logs']
+
+      validate_properties(job_manifest)
+      template.properties = job_manifest['properties'] if job_manifest['properties']
+
+      validate_links(job_manifest)
+
+      template.save
+    end
+
+    private
+
+    def unpack
+      FileUtils.mkdir_p(job_dir)
+
+      desc = "job `#{@name}/#{@version}'"
+      result = Bosh::Exec.sh("tar -C #{job_dir} -xzf #{job_tgz} 2>&1", :on_error => :return)
+      if result.failed?
+        @logger.error("Extracting #{desc} archive failed in dir #{job_dir}, " +
+            "tar returned #{result.exit_status}, " +
+            "output: #{result.output}")
+        raise JobInvalidArchive, "Extracting #{desc} archive failed. Check task debug log for details."
+      end
+    end
+
+    def job_tgz
+      @job_tgz ||= File.join(@release_dir, 'jobs', "#{@name}.tgz")
+    end
+
+    def job_dir
+      @job_dir ||= File.join(@release_dir, 'jobs', @name)
+    end
+
+    def create_template
+      template_attrs = {
+        :release => @release_model,
+        :name => @name,
+        :sha1 => @sha1,
+        :fingerprint => @fingerprint,
+        :version => @version
+      }
+
+      @logger.info("Creating job template `#{@name}/#{@version}' " +
+          'from provided bits')
+      Models::Template.new(template_attrs)
+    end
+
+
+    def load_manifest
+      manifest_file = File.join(job_dir, 'job.MF')
+      unless File.file?(manifest_file)
+        raise JobMissingManifest,
+          "Missing job manifest for `#{@name}'"
+      end
+
+      Psych.load_file(manifest_file)
+    end
+
+    def validate_templates(job_manifest)
+      if job_manifest['templates']
+        job_manifest['templates'].each_key do |relative_path|
+          path = File.join(job_dir, 'templates', relative_path)
+          unless File.file?(path)
+            raise JobMissingTemplateFile,
+              "Missing template file `#{relative_path}' for job `#{@name}'"
+          end
+        end
+      end
+    end
+
+    def validate_monit
+      main_monit_file = File.join(job_dir, 'monit')
+      aux_monit_files = Dir.glob(File.join(job_dir, '*.monit'))
+
+      unless File.exists?(main_monit_file) || aux_monit_files.size > 0
+        raise JobMissingMonit, "Job `#{@name}' is missing monit file"
+      end
+    end
+
+    def parse_package_names(job_manifest)
+      package_names = []
+      if job_manifest['packages']
+        unless job_manifest['packages'].is_a?(Array)
+          raise JobInvalidPackageSpec,
+            "Job `#{@name}' has invalid package spec format"
+        end
+
+        job_manifest['packages'].each do |package_name|
+          package = @packages[package_name]
+          if package.nil?
+            raise JobMissingPackage,
+              "Job `#{@name}' is referencing " +
+                "a missing package `#{package_name}'"
+          end
+          package_names << package.name
+        end
+      end
+      package_names
+    end
+
+    def validate_logs(job_manifest)
+      if job_manifest['logs']
+        unless job_manifest['logs'].is_a?(Hash)
+          raise JobInvalidLogSpec,
+            "Job `#{@name}' has invalid logs spec format"
+        end
+      end
+    end
+
+    def validate_properties(job_manifest)
+      if job_manifest['properties']
+        unless job_manifest['properties'].is_a?(Hash)
+          raise JobInvalidPropertySpec,
+            "Job `#{@name}' has invalid properties spec format"
+        end
+      end
+    end
+
+    def validate_links(job_manifest)
+      if job_manifest['provides']
+        if !job_manifest['provides'].is_a?(Array) || job_manifest['provides'].find { |p| !p.is_a?(String) }
+          raise JobInvalidLinkSpec, "Job `#{@name}' has invalid spec format: 'provides' needs to be an array of strings"
+        end
+      end
+
+      if job_manifest['requires']
+        if !job_manifest['requires'].is_a?(Array) || job_manifest['requires'].find { |p| !p.is_a?(String) }
+          raise JobInvalidLinkSpec, "Job `#{@name}' has invalid spec format: 'requires' needs to be an array of strings"
+        end
+      end
+    end
+  end
+end

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

@@ -382,99 +382,8 @@ module Bosh::Director
       end
 
       def create_job(job_meta, release_dir)
-        name, version = job_meta["name"], job_meta["version"]
-
-        template_attrs = {
-          :release => @release_model,
-          :name => name,
-          :sha1 => job_meta["sha1"],
-          :fingerprint => job_meta["fingerprint"],
-          :version => version
-        }
-
-        logger.info("Creating job template `#{name}/#{version}' " +
-                    "from provided bits")
-        template = Models::Template.new(template_attrs)
-
-        job_tgz = File.join(release_dir, "jobs", "#{name}.tgz")
-        job_dir = File.join(release_dir, "jobs", "#{name}")
-
-        FileUtils.mkdir_p(job_dir)
-
-        desc = "job `#{name}/#{version}'"
-        result = Bosh::Exec.sh("tar -C #{job_dir} -xzf #{job_tgz} 2>&1", :on_error => :return)
-        if result.failed?
-          logger.error("Extracting #{desc} archive failed in dir #{job_dir}, " +
-                       "tar returned #{result.exit_status}, " +
-                       "output: #{result.output}")
-          raise JobInvalidArchive, "Extracting #{desc} archive failed. Check task debug log for details."
-        end
-
-        manifest_file = File.join(job_dir, "job.MF")
-        unless File.file?(manifest_file)
-          raise JobMissingManifest,
-                "Missing job manifest for `#{template.name}'"
-        end
-
-        job_manifest = Psych.load_file(manifest_file)
-
-        if job_manifest["templates"]
-          job_manifest["templates"].each_key do |relative_path|
-            path = File.join(job_dir, "templates", relative_path)
-            unless File.file?(path)
-              raise JobMissingTemplateFile,
-                    "Missing template file `#{relative_path}' for job `#{template.name}'"
-            end
-          end
-        end
-
-        main_monit_file = File.join(job_dir, "monit")
-        aux_monit_files = Dir.glob(File.join(job_dir, "*.monit"))
-
-        unless File.exists?(main_monit_file) || aux_monit_files.size > 0
-          raise JobMissingMonit, "Job `#{template.name}' is missing monit file"
-        end
-
-        template.blobstore_id = BlobUtil.create_blob(job_tgz)
-
-        package_names = []
-        if job_manifest["packages"]
-          unless job_manifest["packages"].is_a?(Array)
-            raise JobInvalidPackageSpec,
-                  "Job `#{template.name}' has invalid package spec format"
-          end
-
-          job_manifest["packages"].each do |package_name|
-            package = @packages[package_name]
-            if package.nil?
-              raise JobMissingPackage,
-                "Job `#{template.name}' is referencing " +
-                  "a missing package `#{package_name}'"
-            end
-            package_names << package.name
-          end
-        end
-        template.package_names = package_names
-
-        if job_manifest["logs"]
-          unless job_manifest["logs"].is_a?(Hash)
-            raise JobInvalidLogSpec,
-                  "Job `#{template.name}' has invalid logs spec format"
-          end
-
-          template.logs = job_manifest["logs"]
-        end
-
-        if job_manifest["properties"]
-          unless job_manifest["properties"].is_a?(Hash)
-            raise JobInvalidPropertySpec,
-                  "Job `#{template.name}' has invalid properties spec format"
-          end
-
-          template.properties = job_manifest["properties"]
-        end
-
-        template.save
+        release_job = ReleaseJob.new(job_meta, @release_model, release_dir, @packages, logger)
+        release_job.create
       end
 
       # @param [Array<Array>] jobs Existing jobs metadata

data/lib/bosh/director/problem_handlers/inactive_disk.rb

@@ -37,7 +37,7 @@ module Bosh::Director
       end
 
       resolution :ignore do
-        plan { "Ignore problem" }
+        plan { "Skip for now" }
         action { }
       end
 

data/lib/bosh/director/problem_handlers/missing_disk.rb

@@ -31,7 +31,7 @@ module Bosh::Director
       end
 
       resolution :ignore do
-        plan { 'Ignore problem' }
+        plan { 'Skip for now' }
         action { }
       end
 

data/lib/bosh/director/problem_handlers/missing_vm.rb

@@ -13,17 +13,17 @@ module Bosh::Director
       end
 
       resolution :ignore do
-        plan { "Ignore problem" }
+        plan { "Skip for now" }
         action { }
       end
 
       resolution :recreate_vm do
-        plan { "Recreate VM using last known apply spec" }
+        plan { "Recreate VM" }
         action { recreate_vm(@vm) }
       end
 
       resolution :delete_vm_reference do
-        plan { "Delete VM reference (DANGEROUS!)" }
+        plan { "Delete VM reference" }
         action { delete_vm_reference(@vm, skip_cid_check: true) }
       end
 
@@ -32,4 +32,4 @@ module Bosh::Director
       end
     end
   end
-end
+end

data/lib/bosh/director/problem_handlers/out_of_sync_vm.rb

@@ -37,7 +37,7 @@ module Bosh::Director
       end
 
       resolution :ignore do
-        plan { "Ignore problem" }
+        plan { "Skip for now" }
         action { }
       end
 

data/lib/bosh/director/problem_handlers/unbound_instance_vm.rb

@@ -34,7 +34,7 @@ module Bosh::Director
       end
 
       resolution :ignore do
-        plan { "Ignore problem" }
+        plan { "Skip for now" }
         action { }
       end
 

data/lib/bosh/director/problem_handlers/unresponsive_agent.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module ProblemHandlers
     class UnresponsiveAgent < Base
@@ -25,23 +23,23 @@ module Bosh::Director
       end
 
       resolution :ignore do
-        plan { "Ignore problem" }
+        plan { 'Skip for now' }
         action { }
       end
 
       resolution :reboot_vm do
-        plan { "Reboot VM" }
+        plan { 'Reboot VM' }
         action { validate; ensure_cid; reboot_vm(@vm) }
       end
 
       resolution :recreate_vm do
-        plan { "Recreate VM using last known apply spec" }
+        plan { 'Recreate VM' }
         action { validate; ensure_cid; recreate_vm(@vm) }
       end
 
       resolution :delete_vm_reference do
-        plan { "Delete VM reference (DANGEROUS!)" }
-        action { validate; ensure_no_cid; delete_vm_reference(@vm) }
+        plan { 'Delete VM reference (forceful; may need to manually delete VM from the Cloud to avoid IP conflicts)' }
+        action { validate; delete_vm_reference(@vm, skip_cid_check: true) }
       end
 
       def agent_alive?
@@ -54,20 +52,20 @@ module Bosh::Director
       def ensure_cid
         if @vm.cid.nil?
           handler_error("VM `#{@vm.id}' doesn't have a cloud id, " +
-                            "only resolution is to delete the VM reference.")
+              'only resolution is to delete the VM reference.')
         end
       end
 
       def ensure_no_cid
         if @vm.cid
           handler_error("VM `#{@vm.id}' has a cloud id, " +
-                            "please use a different resolution.")
+              'please use a different resolution.')
         end
       end
 
       def validate
         if agent_alive?
-          handler_error("Agent is responding now, skipping resolution")
+          handler_error('Agent is responding now, skipping resolution')
         end
       end
 

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3008.0'
+    VERSION = '1.3010.0'
   end
 end

data/lib/bosh/director.rb

@@ -122,6 +122,7 @@ require 'bosh/director/jobs/run_errand'
 require 'bosh/director/jobs/cloud_check/scan'
 require 'bosh/director/jobs/cloud_check/scan_and_fix'
 require 'bosh/director/jobs/cloud_check/apply_resolutions'
+require 'bosh/director/jobs/release/release_job'
 require 'bosh/director/jobs/ssh'
 
 require 'bosh/director/models/helpers/model_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3008.0
+  version: 1.3010.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-06 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.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3008.0
+        version: 1.3010.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  cfb32d
+  1dcc8d
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -770,6 +770,7 @@ files:
 - lib/bosh/director/jobs/export_release.rb
 - lib/bosh/director/jobs/fetch_logs.rb
 - lib/bosh/director/jobs/import_compiled_packages.rb
+- lib/bosh/director/jobs/release/release_job.rb
 - lib/bosh/director/jobs/run_errand.rb
 - lib/bosh/director/jobs/scheduled_backup.rb
 - lib/bosh/director/jobs/snapshot_deployment.rb