bosh-director 1.3163.0 → 1.3165.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1587b4eccc78429904cf066ccf184484654ce06
-  data.tar.gz: 7894455133a637d96a5e3e33d01fb82e65d6ad3c
+  metadata.gz: 437509ee29b6b2a295acd39582fbb8581ab89dbd
+  data.tar.gz: aa6897b42854ca6cb4eb6f549a24eecb44b2a605
 SHA512:
-  metadata.gz: cc9f2d84ad6a67d3497c88ec62d42a9a49f3811c1039dabe5e81fc75f1ef5e3adc9266990ebdbf3b86573c73ab9c2c258494142c73244a990fbdf9dc153e5cb8
-  data.tar.gz: 2f758e5cc31f37714690cdd13114f2999a0779d241307ac2b6479914727187d3338b8d0912ea417f677496de55f81c3544b4201e742338bebd6254964e73b9c1
+  metadata.gz: f0e5cf4691d434e4090ba3317d04fb8047bb031bbb6d9a882ce0f2048b23fe0b64cb578e9154cecd7b967a9b1f74fc261de7eb83409eb35db7c4ee3e971af446
+  data.tar.gz: 9d76083b5ecdc2f7359f2a424a637cbc1e84a4c2c7ba8a420d1ca2f7fe6cf97991229cffdbd790072d9aeea5fbc28de5fba898f097d5355357e50c4c002eee86

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

@@ -11,10 +11,10 @@ module Bosh::Director
         azs = parse_availability_zones(cloud_manifest)
         az_list = CloudPlanner.index_by_name(azs)
         networks = parse_networks(cloud_manifest, global_network_resolver, azs)
-        compilation_config = parse_compilation(cloud_manifest, networks, az_list)
         resource_pools = parse_resource_pools(cloud_manifest)
         vm_types = parse_vm_types(cloud_manifest)
         disk_types = parse_disk_types(cloud_manifest)
+        compilation_config = parse_compilation(cloud_manifest, networks, az_list, vm_types)
 
         CloudPlanner.new({
           availability_zones_list: az_list,
@@ -75,9 +75,9 @@ module Bosh::Director
         parsed_networks
       end
 
-      def parse_compilation(cloud_manifest, networks, az_list)
+      def parse_compilation(cloud_manifest, networks, az_list, vm_types)
         compilation_spec = safe_property(cloud_manifest, 'compilation', :class => Hash)
-        config = CompilationConfig.new(compilation_spec, az_list)
+        config = CompilationConfig.new(compilation_spec, az_list, vm_types)
 
         compilation_network = networks.find { |network| network.name == config.network_name }
         if compilation_network.nil?

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DeploymentPlan
     ##
@@ -11,7 +9,7 @@ module Bosh::Director
       attr_accessor :workers
 
       # @return [Hash] cloud properties to use when creating VMs. (optional)
-      attr_accessor :cloud_properties
+      attr_reader :cloud_properties
 
       # @return [Hash] environment to use when creating VMs. (optional)
       attr_accessor :env
@@ -23,10 +21,9 @@ module Bosh::Director
 
       attr_reader :availability_zone
 
-      # Creates compilation configuration spec from the deployment manifest.
-      # @param [DeploymentPlan] deployment
-      # @param [Hash] compilation_config parsed compilation config YAML section
-      def initialize(compilation_config, azs_list = {})
+      attr_reader :vm_type
+
+      def initialize(compilation_config, azs_list, vm_types = [])
         @workers = safe_property(compilation_config, 'workers', class: Integer, min: 1)
 
         @network_name = safe_property(compilation_config, 'network', class: String)
@@ -46,6 +43,23 @@ module Bosh::Director
           raise Bosh::Director::CompilationConfigInvalidAvailabilityZone,
             "Compilation config references unknown az '#{az_name}'. Known azs are: [#{azs_list.keys.join(', ')}]"
         end
+
+        vm_type_name = safe_property(compilation_config, 'vm_type', class: String, optional: true)
+
+        if vm_type_name
+          @vm_type = vm_types.find { |vm_type| vm_type.name == vm_type_name }
+
+          if @vm_type.nil?
+            vm_types_names = vm_types.map { |vm_type| vm_type.name }
+            raise Bosh::Director::CompilationConfigInvalidVmType,
+              "Compilation config references unknown vm type '#{vm_type_name}'. Known vm types are: #{vm_types_names.join(', ')}"
+          end
+
+          unless @cloud_properties.empty?
+            raise Bosh::Director::CompilationConfigCloudPropertiesNotAllowed,
+              "Compilation config is using vm type '#{@vm_type.name}' and should not be configuring cloud_properties."
+          end
+        end
       end
 
       def availability_zone_name

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

@@ -66,7 +66,12 @@ module Bosh::Director
       end
 
       def create_instance_plan(stemcell)
-        vm_type = CompilationVmType.new(@deployment_plan.compilation.cloud_properties)
+        if @deployment_plan.compilation.vm_type
+          vm_type = @deployment_plan.compilation.vm_type
+        else
+          vm_type = CompilationVmType.new(@deployment_plan.compilation.cloud_properties)
+        end
+
         env = Env.new(@deployment_plan.compilation.env)
 
         @compile_job = CompilationJob.new(vm_type, stemcell, env, @deployment_plan.compilation.network_name)

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

@@ -68,7 +68,6 @@ module Bosh::Director
         @logger = logger
         @deployment_model = deployment_model
         @job_name = job_name
-        @name = "#{job_name}/#{@index}"
         @vm_type = vm_type
         @stemcell = stemcell
         @env = env
@@ -99,7 +98,11 @@ module Bosh::Director
       end
 
       def to_s
-        @name
+        if @uuid.nil?
+          "#{@job_name}/#{@index}"
+        else
+          "#{@job_name}/#{@index} (#{@uuid})"
+        end
       end
 
       # Looks up instance model in DB and binds it to this instance spec.

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

@@ -9,7 +9,6 @@ module Bosh::Director
 
         attr_reader :compilations_performed
 
-        # @param [DeploymentPlan] deployment_plan Deployment plan
         def initialize(jobs_to_compile, compilation_config, compilation_instance_pool, logger, event_log, director_job)
           @event_log = event_log
           @logger = logger

data/lib/bosh/director/errors.rb

@@ -137,6 +137,8 @@ module Bosh::Director
 
   CompilationConfigUnknownNetwork = err(120001)
   CompilationConfigInvalidAvailabilityZone = err(120002)
+  CompilationConfigInvalidVmType = err(120003)
+  CompilationConfigCloudPropertiesNotAllowed = err(120004)
 
   # Manifest parsing: network section
   NetworkReservationInvalidIp = err(130001)

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3163.0'
+    VERSION = '1.3165.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3163.0
+  version: 1.3165.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-28 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.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3163.0
+        version: 1.3165.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement