bosh-director 1.3202.0 → 1.3213.0

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

@@ -30,6 +30,7 @@ module Bosh
           return @changes if @changes
 
           @changes = Set.new
+          @changes << :dirty if @instance.dirty?
           @changes << :restart if needs_restart?
           @changes << :recreate if needs_recreate?
           @changes << :cloud_properties if instance.cloud_properties_changed?
@@ -38,7 +39,7 @@ module Bosh
           @changes << :network if networks_changed?
           @changes << :packages if packages_changed?
           @changes << :persistent_disk if persistent_disk_changed?
-          @changes << :configuration if instance.configuration_changed?
+          @changes << :configuration if configuration_changed?
           @changes << :job if job_changed?
           @changes << :state if state_changed?
           @changes << :dns if dns_changed?
@@ -132,6 +133,12 @@ module Bosh
           end
         end
 
+        def configuration_changed?
+          changed = instance.configuration_hash != instance_model.spec['configuration_hash']
+          log_changes(__method__, instance_model.spec['configuration_hash'], instance.configuration_hash, instance) if changed
+          changed
+        end
+
         def mark_desired_network_plans_as_existing
           network_plans.select(&:desired?).each { |network_plan| network_plan.existing = true }
         end
@@ -166,7 +173,7 @@ module Bosh
             @instance.model.deployment.name,
             @desired_instance.job.default_network,
             desired_reservations,
-            @instance.current_state,
+            @instance.current_networks,
             @instance.availability_zone,
             @instance.index,
             @instance.uuid,
@@ -178,6 +185,10 @@ module Bosh
           network_settings.to_hash
         end
 
+        def network_address(network_name)
+          network_settings.network_address(network_name)
+        end
+
         def network_addresses
           network_settings.network_addresses
         end

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

@@ -21,6 +21,7 @@ module Bosh::Director
           'job' => job.spec,
           'index' => instance.index,
           'bootstrap' => instance.bootstrap?,
+          'name' => instance.job_name,
           'id' => instance.uuid,
           'az' => instance.availability_zone_name,
           'networks' => instance_plan.network_settings_hash,
@@ -31,6 +32,8 @@ module Bosh::Director
           'properties' => job.properties,
           'dns_domain_name' => dns_manager.dns_domain_name,
           'links' => job.link_spec,
+          'address' => instance_plan.network_settings.network_address,
+          'update' => job.update_spec
         }
 
         if job.persistent_disk_type
@@ -104,21 +107,24 @@ module Bosh::Director
           'job',
           'index',
           'bootstrap',
+          'name',
           'id',
           'az',
           'networks',
-          'packages',
           'properties',
           'dns_domain_name',
           'links',
-          'persistent_disk'
+          'persistent_disk',
+          'address'
         ]
         template_hash = @full_spec.select {|k,v| keys.include?(k) }
 
         networks_hash = template_hash['networks']
         networks_hash_with_dns = networks_hash.each_pair do |network_name, network_settings|
-          settings_with_dns = network_settings.merge({'dns_record_name' => @dns_manager.dns_record_name(@full_spec['index'], @full_spec['job']['name'], network_name, @full_spec['deployment'])})
-          networks_hash[network_name] = settings_with_dns
+          if @full_spec['job'] != nil
+            settings_with_dns = network_settings.merge({'dns_record_name' => @dns_manager.dns_record_name(@full_spec['index'], @full_spec['job']['name'], network_name, @full_spec['deployment'])})
+            networks_hash[network_name] = settings_with_dns
+          end
         end
 
         template_hash.merge({
@@ -138,7 +144,9 @@ module Bosh::Director
           'deployment',
           'job',
           'index',
+          'name',
           'id',
+          'az',
           'networks',
           'packages',
           'dns_domain_name',

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

@@ -37,6 +37,9 @@ module Bosh::Director
       # @return [DeploymentPlan::VmType]
       attr_accessor :vm_type
 
+      # @return [DeploymentPlan::VmExtension]
+      attr_accessor :vm_extensions
+
       # @return [DeploymentPlan::Env]
       attr_accessor :env
 
@@ -80,6 +83,8 @@ module Bosh::Director
 
       attr_reader :link_paths
 
+      attr_accessor :did_change
+
       def self.parse(plan, job_spec, event_log, logger)
         parser = JobSpecParser.new(plan, event_log, logger)
         parser.parse(job_spec)
@@ -106,6 +111,8 @@ module Bosh::Director
         @availability_zones = []
 
         @instance_plans = []
+
+        @did_change = false
       end
 
       def self.is_legacy_spec?(job_spec)
@@ -136,7 +143,12 @@ module Bosh::Director
           "sha1" => job_spec["sha1"],
           "blobstore_id" => job_spec["blobstore_id"]
         }
-        job_spec["templates"] = [template]
+
+        # Supporting 'template_scoped_properties' for legacy spec is going to be messy.
+        # So we will support this feature if a user want to use legacy spec. If they
+        # want to use properties per template, let them use the regular way of defining
+        # templates, i.e. by using the 'templates' key
+        job_spec['templates'] = [template]
       end
 
 
@@ -160,35 +172,46 @@ module Bosh::Director
       # populate agent state.
       # @return [Hash] Hash representation
       def spec
-        first_template = @templates[0]
-        result = {
-          "name" => @name,
-          "templates" => [],
-          # --- Legacy ---
-          "template" => first_template.name,
-          "version" => first_template.version,
-          "sha1" => first_template.sha1,
-          "blobstore_id" => first_template.blobstore_id
-        }
-        if first_template.logs
-          result["logs"] = first_template.logs
-        end
-        # --- /Legacy ---
-
-        @templates.each do |template|
-          template_entry = {
-            "name" => template.name,
-            "version" => template.version,
-            "sha1" => template.sha1,
-            "blobstore_id" => template.blobstore_id
+        if @templates.size >= 1
+          first_template = @templates[0]
+          result = {
+            "name" => @name,
+            "templates" => [],
+            # --- Legacy ---
+            "template" => first_template.name,
+            "version" => first_template.version,
+            "sha1" => first_template.sha1,
+            "blobstore_id" => first_template.blobstore_id
           }
-          if template.logs
-            template_entry["logs"] = template.logs
+
+          result['template_scoped_properties'] = first_template.template_scoped_properties[@name] unless first_template.template_scoped_properties[@name].nil?
+
+          if first_template.logs
+            result["logs"] = first_template.logs
+          end
+          # --- /Legacy ---
+
+          @templates.each do |template|
+            template_entry = {
+              "name" => template.name,
+              "version" => template.version,
+              "sha1" => template.sha1,
+              "blobstore_id" => template.blobstore_id
+            }
+
+            template_entry['template_scoped_properties'] = template.template_scoped_properties[@name] unless template.template_scoped_properties[@name].nil?
+
+            if template.logs
+              template_entry["logs"] = template.logs
+            end
+            result["templates"] << template_entry
           end
-          result["templates"] << template_entry
+          result
         end
+      end
 
-        result
+      def update_spec
+        update.to_hash
       end
 
       # Returns package specs for all packages in the job indexed by package
@@ -248,9 +271,9 @@ module Bosh::Director
             offending_template2 = templates.find { |t| t.release == release2 }
 
             raise JobPackageCollision,
-              "Package name collision detected in job `#{@name}': "\
-                  "template `#{release1.name}/#{offending_template1.name}' depends on package `#{release1.name}/#{package_name}', "\
-                  "template `#{release2.name}/#{offending_template2.name}' depends on `#{release2.name}/#{package_name}'. " +
+              "Package name collision detected in instance group '#{@name}': "\
+                  "job '#{release1.name}/#{offending_template1.name}' depends on package '#{release1.name}/#{package_name}', "\
+                  "job '#{release2.name}/#{offending_template2.name}' depends on '#{release2.name}/#{package_name}'. " +
                 'BOSH cannot currently collocate two packages with identical names from separate releases.'
           end
         end
@@ -273,11 +296,17 @@ module Bosh::Director
         end
       end
 
-      def starts_on_deploy?
+      def has_network?(network_name)
+        networks.any? do |network|
+          network.name == network_name
+        end
+      end
+
+      def is_service?
         @lifecycle == 'service'
       end
 
-      def can_run_as_errand?
+      def is_errand?
         @lifecycle == 'errand'
       end
 
@@ -318,10 +347,6 @@ module Bosh::Director
       # @param [Hash] collection All properties collection
       # @return [Hash] Properties required by templates included in this job
       def filter_properties(collection)
-        if @templates.empty?
-          raise DirectorError, "Can't extract job properties before parsing job templates"
-        end
-
         if @templates.none? { |template| template.properties }
           return collection
         end
@@ -331,17 +356,26 @@ module Bosh::Director
         end
 
         raise JobIncompatibleSpecs,
-          "Job `#{name}' has specs with conflicting property definition styles between" +
+          "Instance group '#{name}' has specs with conflicting property definition styles between" +
             " its job spec templates.  This may occur if colocating jobs, one of which has a spec file including" +
-            " `properties' and one which doesn't."
+            " 'properties' and one which doesn't."
       end
 
       def extract_template_properties(collection)
         result = {}
 
         @templates.each do |template|
-          template.properties.each_pair do |name, definition|
-            copy_property(result, collection, name, definition["default"])
+          # If a template has properties that were defined in the deployment manifest
+          # for that template only, then we need to bind only these properties, and not
+          # make them available to other templates in the same deployment job. That can
+          # be done by checking @template_scoped_properties variable of each
+          # template
+          if template.has_template_scoped_properties(@name)
+            template.bind_template_scoped_properties(@name)
+          else
+            template.properties.each_pair do |name, definition|
+              copy_property(result, collection, name, definition["default"])
+            end
           end
         end
 

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

@@ -16,19 +16,19 @@ module Bosh::Director
         networks.each do |network|
           unless network.has_azs?(az_names)
             raise JobNetworkMissingRequiredAvailabilityZone,
-              "Job '#{job.name}' must specify availability zone that matches availability zones of network '#{network.name}'"
+              "Instance group '#{job.name}' must specify availability zone that matches availability zones of network '#{network.name}'"
           end
         end
       end
 
       def check_validity_of(az_names, job_name)
         if az_names.empty?
-          raise JobMissingAvailabilityZones, "Job '#{job_name}' has empty availability zones"
+          raise JobMissingAvailabilityZones, "Instance group '#{job_name}' has empty availability zones"
         end
 
         az_names.each do |name|
           unless name.is_a?(String)
-            raise JobInvalidAvailabilityZone, "Job '#{job_name}' has invalid availability zone '#{name}', string expected"
+            raise JobInvalidAvailabilityZone, "Instance group '#{job_name}' has invalid availability zone '#{name}', string expected"
           end
         end
       end
@@ -37,7 +37,7 @@ module Bosh::Director
         az_names.map do |name|
           az = deployment.availability_zone(name)
           if az.nil?
-            raise JobUnknownAvailabilityZone, "Job '#{job_name}' references unknown availability zone '#{name}'"
+            raise JobUnknownAvailabilityZone, "Instance group '#{job_name}' references unknown availability zone '#{name}'"
           end
           az
         end

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

@@ -36,9 +36,9 @@ module Bosh::Director
         existing_job = @deployment_plan.job(migrated_from_job.name)
         if existing_job && existing_job.name != desired_job.name
           raise DeploymentInvalidMigratedFromJob,
-            "Failed to migrate job '#{migrated_from_job.name}' to '#{desired_job_name}'. " +
-              'A deployment can not migrate a job and also specify it. ' +
-              "Please remove job '#{migrated_from_job.name}'."
+            "Failed to migrate instance group '#{migrated_from_job.name}' to '#{desired_job_name}'. " +
+              'A deployment can not migrate an instance group and also specify it. ' +
+              "Please remove instance group '#{migrated_from_job.name}'."
         end
 
         other_jobs = @deployment_plan.jobs.reject { |job| job.name == desired_job_name }
@@ -51,7 +51,7 @@ module Bosh::Director
 
         if migrate_to_multiple_jobs
           raise DeploymentInvalidMigratedFromJob,
-            "Failed to migrate job '#{migrated_from_job.name}' to '#{desired_job_name}'. A job may be migrated to only one job."
+            "Failed to migrate instance group '#{migrated_from_job.name}' to '#{desired_job_name}'. An instance group may be migrated to only one instance group."
         end
 
         migrated_from_job_instances = []
@@ -62,13 +62,13 @@ module Bosh::Director
               migrated_from_job.availability_zone.nil?  &&
               desired_job.availability_zones.to_a.compact.any?
               raise DeploymentInvalidMigratedFromJob,
-                "Failed to migrate job '#{migrated_from_job.name}' to '#{desired_job_name}', availability zone of '#{migrated_from_job.name}' is not specified"
+                "Failed to migrate instance group '#{migrated_from_job.name}' to '#{desired_job_name}', availability zone of '#{migrated_from_job.name}' is not specified"
             end
 
             if !migrated_from_job.availability_zone.nil? && !instance.availability_zone.nil?
               if migrated_from_job.availability_zone != instance.availability_zone
                 raise DeploymentInvalidMigratedFromJob,
-                  "Failed to migrate job '#{migrated_from_job.name}' to '#{desired_job_name}', '#{migrated_from_job.name}' belongs to availability zone '#{instance.availability_zone}' and manifest specifies '#{migrated_from_job.availability_zone}'"
+                  "Failed to migrate instance group '#{migrated_from_job.name}' to '#{desired_job_name}', '#{migrated_from_job.name}' belongs to availability zone '#{instance.availability_zone}' and manifest specifies '#{migrated_from_job.availability_zone}'"
               end
             end
 
@@ -78,7 +78,7 @@ module Bosh::Director
 
             migrated_from_job_instances << instance
 
-            @logger.debug("Migrating job '#{migrated_from_job.name}/#{instance.uuid} (#{instance.index})' to '#{desired_job.name}/#{instance.uuid} (#{instance.index})'")
+            @logger.debug("Migrating instance group '#{migrated_from_job.name}/#{instance.uuid} (#{instance.index})' to '#{desired_job.name}/#{instance.uuid} (#{instance.index})'")
           end
         end
 

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

@@ -26,7 +26,7 @@ module Bosh::Director
       def parse_networks(job_spec, job_name, manifest_networks)
         network_specs = safe_property(job_spec, "networks", :class => Array)
         if network_specs.empty?
-          raise JobMissingNetwork, "Job `#{job_name}' must specify at least one network"
+          raise JobMissingNetwork, "Instance group '#{job_name}' must specify at least one network"
         end
         network_specs.map do |network_spec|
           network_name = safe_property(network_spec, "name", :class => String)
@@ -43,7 +43,7 @@ module Bosh::Director
       def look_up_deployment_network(manifest_networks, job_name, network_name)
         deployment_network = manifest_networks.find{ |network| network.name == network_name }
         if deployment_network.nil?
-          raise JobUnknownNetwork, "Job '#{job_name}' references an unknown network '#{network_name}'"
+          raise JobUnknownNetwork, "Instance group '#{job_name}' references an unknown network '#{network_name}'"
         end
         deployment_network
       end
@@ -54,7 +54,7 @@ module Bosh::Director
           static_ips = []
           each_ip(static_ips_raw) do |ip|
             if static_ips.include?(ip)
-              raise JobInvalidStaticIPs, "Job '#{job_name}' specifies static IP '#{format_ip(ip)}' more than once"
+              raise JobInvalidStaticIPs, "Instance group '#{job_name}' specifies static IP '#{format_ip(ip)}' more than once"
             end
 
             static_ips.push(ip)
@@ -67,7 +67,7 @@ module Bosh::Director
         network.properties_for_which_the_network_is_the_default.each do |property|
           unless @properties_that_require_defaults.include?(property)
             raise JobNetworkInvalidDefault,
-              "Job `#{job_name}' specified an invalid default network property `#{property}', " +
+              "Instance group '#{job_name}' specified an invalid default network property '#{property}', " +
                 "valid properties are: " + @properties_that_require_defaults.join(", ")
           end
         end
@@ -89,7 +89,7 @@ module Bosh::Director
         }
         unless missing_default_properties.empty?
           raise JobNetworkMissingDefault,
-            "Job `#{job_name}' must specify which network is default for " +
+            "Instance group '#{job_name}' must specify which network is default for " +
               missing_default_properties.sort.join(", ") + ", since it has more than one network configured"
         end
       end
@@ -104,7 +104,7 @@ module Bosh::Director
             "'#{property}' has default networks: #{quoted_network_names}."
           end
           raise JobNetworkMultipleDefaults,
-            "Job `#{job_name}' specified more than one network to contain default. #{message_for_each_property.join(' ')}"
+            "Instance group '#{job_name}' specified more than one network to contain default. #{message_for_each_property.join(' ')}"
         end
       end
 

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

@@ -33,6 +33,8 @@ module Bosh::Director
         parse_disk
         parse_properties
         parse_resource_pool
+        check_remove_dev_tools
+
         parse_update_config
 
         networks = JobNetworksParser.new(Network::VALID_DEFAULTS).parse(@job_spec, @job.name, @deployment.networks)
@@ -66,7 +68,7 @@ module Bosh::Director
 
         unless Job::VALID_LIFECYCLE_PROFILES.include?(lifecycle)
           raise JobInvalidLifecycle,
-            "Invalid lifecycle `#{lifecycle}' for `#{@job.name}', " +
+            "Invalid lifecycle '#{lifecycle}' for '#{@job.name}', " +
             "valid lifecycle profiles are: #{Job::VALID_LIFECYCLE_PROFILES.join(', ')}"
         end
 
@@ -85,7 +87,7 @@ module Bosh::Director
 
           if @job.release.nil?
             raise JobUnknownRelease,
-                  "Job `#{@job.name}' references an unknown release `#{release_name}'"
+                  "Instance group '#{@job.name}' references an unknown release '#{release_name}'"
           end
         end
       end
@@ -95,8 +97,8 @@ module Bosh::Director
         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."
+              "Please use 'templates' when specifying multiple templates for a job. " +
+              "'template' for multiple templates will soon be unsupported."
             )
           end
 
@@ -105,7 +107,7 @@ module Bosh::Director
           end
 
           unless @job.release
-            raise JobMissingRelease, "Cannot tell what release job `#{@job.name}' is supposed to use, please explicitly specify one"
+            raise JobMissingRelease, "Cannot tell what release job '#{@job.name}' is supposed to use, please explicitly specify one"
           end
 
           Array(template_names).each do |template_name|
@@ -123,6 +125,12 @@ module Bosh::Director
         end
 
         if templates
+          release_manager = Api::ReleaseManager.new
+
+          # Key: release name.
+          # Value: list of templates models of release version.
+          release_versions_templates_models_hash = {}
+
           templates.each do |template_spec|
             template_name = safe_property(template_spec, 'name', class: String)
             release_name = safe_property(template_spec, 'release', class: String, optional: true)
@@ -131,24 +139,59 @@ module Bosh::Director
               release = @deployment.release(release_name)
               unless release
                 raise JobUnknownRelease,
-                      "Template `#{template_name}' (job `#{@job.name}') references an unknown release `#{release_name}'"
+                      "Job '#{template_name}' (instance group '#{@job.name}') references an unknown release '#{release_name}'"
               end
             else
               release = @job.release
               unless release
-                raise JobMissingRelease, "Cannot tell what release template `#{template_name}' (job `#{@job.name}') is supposed to use, please explicitly specify one"
+                raise JobMissingRelease, "Cannot tell what release template '#{template_name}' (instance group '#{@job.name}') is supposed to use, please explicitly specify one"
               end
             end
 
-            @job.templates << release.get_or_create_template(template_name)
+            if !release_versions_templates_models_hash.has_key?(release_name)
+              release_model = release_manager.find_by_name(release.name)
+              current_release_version = release_manager.find_version(release_model, release.version)
+              release_versions_templates_models_hash[release_name] = current_release_version.templates
+            end
+
+            templates_models_list = release_versions_templates_models_hash[release_name]
+            current_template_model = templates_models_list.find {|target| target.name == template_name }
+
+            template = release.get_or_create_template(template_name)
 
-            links = safe_property(template_spec, 'links', class: Hash, optional: true)
-            @logger.debug("Parsing template links: #{links.inspect}")
+            if current_template_model == nil
+              raise "Job '#{template_name}' not found in Template table"
+            end
+
+            if current_template_model.consumes != nil
+              current_template_model.consumes.each do |consumes|
+                template.add_link_info(@job.name,'consumes', consumes["name"], consumes)
+              end
+            end
+            if current_template_model.provides != nil
+              current_template_model.provides.each do |provides|
+                template.add_link_info(@job.name, 'provides', provides["name"], provides)
+              end
+            end
 
-            links.to_a.each do |name, path|
-              link_path = LinkPath.parse(@deployment.name, path, @logger)
-              @job.add_link_path(template_name, name, link_path)
+            provides_links = safe_property(template_spec, 'provides', class: Hash, optional: true)
+            provides_links.to_a.each do |link_name, source|
+              template.add_link_info(@job.name, "provides", link_name, source)
             end
+
+            consumes_links = safe_property(template_spec, 'consumes', class: Hash, optional: true)
+            consumes_links.to_a.each do |link_name, source|
+              template.add_link_info(@job.name, 'consumes', link_name, source)
+            end
+
+            if template_spec.has_key?("properties")
+              template.add_template_scoped_properties(
+                  safe_property(template_spec, 'properties', class: Hash, optional: true, default: nil),
+                  @job.name
+              )
+            end
+
+            @job.templates << template
           end
         end
       end
@@ -158,7 +201,7 @@ module Bosh::Director
         @job.templates.each do |template|
           if all_names.count(template.name) > 1
             raise JobInvalidTemplates,
-                  "Colocated job template `#{template.name}' has the same name in multiple releases. " +
+                  "Colocated job template '#{template.name}' has the same name in multiple releases. " +
                   "BOSH cannot currently colocate two job templates with identical names from separate releases."
           end
         end
@@ -171,7 +214,7 @@ module Bosh::Director
 
         if disk_type_name && disk_pool_name
           raise JobInvalidPersistentDisk,
-            "Job `#{@job.name}' specifies both 'disk_types' and 'disk_pools', only one key is allowed. " +
+            "Instance group '#{@job.name}' specifies both 'disk_types' and 'disk_pools', only one key is allowed. " +
               "'disk_pools' key will be DEPRECATED in the future."
         end
 
@@ -185,14 +228,14 @@ module Bosh::Director
 
         if disk_size && disk_name
           raise JobInvalidPersistentDisk,
-            "Job `#{@job.name}' references both a persistent disk size `#{disk_size}' " +
-              "and a persistent disk #{disk_source} `#{disk_name}'"
+            "Instance group '#{@job.name}' references both a persistent disk size '#{disk_size}' " +
+              "and a persistent disk #{disk_source} '#{disk_name}'"
         end
 
         if disk_size
           if disk_size < 0
             raise JobInvalidPersistentDisk,
-              "Job `#{@job.name}' references an invalid persistent disk size `#{disk_size}'"
+              "Instance group '#{@job.name}' references an invalid persistent disk size '#{disk_size}'"
           else
             @job.persistent_disk = disk_size
           end
@@ -202,7 +245,7 @@ module Bosh::Director
           disk_type = @deployment.disk_type(disk_name)
           if disk_type.nil?
             raise JobUnknownDiskType,
-                  "Job `#{@job.name}' references an unknown disk #{disk_source} `#{disk_name}'"
+                  "Instance group '#{@job.name}' references an unknown disk #{disk_source} '#{disk_name}'"
           else
             @job.persistent_disk_type = disk_type
           end
@@ -222,7 +265,7 @@ module Bosh::Director
 
           if resolved.nil?
             raise JobInvalidPropertyMapping,
-                  "Cannot satisfy property mapping `#{to}: #{from}', as `#{from}' is not in deployment properties"
+                  "Cannot satisfy property mapping '#{to}: #{from}', as '#{from}' is not in deployment properties"
           end
 
           @job.all_properties[to] = resolved
@@ -237,7 +280,7 @@ module Bosh::Director
           resource_pool = @deployment.resource_pool(resource_pool_name)
           if resource_pool.nil?
             raise JobUnknownResourcePool,
-              "Job `#{@job.name}' references an unknown resource pool `#{resource_pool_name}'"
+              "Instance group '#{@job.name}' references an unknown resource pool '#{resource_pool_name}'"
           end
 
           vm_type = VmType.new({
@@ -245,11 +288,13 @@ module Bosh::Director
             'cloud_properties' => resource_pool.cloud_properties
           })
 
+          vm_extensions = []
+
           stemcell = resource_pool.stemcell
 
           if !env_hash.empty? && !resource_pool.env.empty?
             raise JobAmbiguousEnv,
-              "Job '#{@job.name}' and resource pool: '#{resource_pool_name}' both declare env properties"
+              "Instance group '#{@job.name}' and resource pool: '#{resource_pool_name}' both declare env properties"
           end
 
           if env_hash.empty?
@@ -260,18 +305,22 @@ module Bosh::Director
           vm_type = @deployment.vm_type(vm_type_name)
           if vm_type.nil?
             raise JobUnknownVmType,
-              "Job `#{@job.name}' references an unknown vm type `#{vm_type_name}'"
+              "Instance group '#{@job.name}' references an unknown vm type '#{vm_type_name}'"
           end
 
+          vm_extension_names = Array(safe_property(@job_spec, 'vm_extensions', class: Array, optional: true))
+          vm_extensions = Array(vm_extension_names).map {|vm_extension_name| @deployment.vm_extension(vm_extension_name)}
+
           stemcell_name = safe_property(@job_spec, 'stemcell', class: String)
           stemcell = @deployment.stemcell(stemcell_name)
           if stemcell.nil?
             raise JobUnknownStemcell,
-              "Job `#{@job.name}' references an unknown stemcell `#{stemcell_name}'"
+              "Instance group '#{@job.name}' references an unknown stemcell '#{stemcell_name}'"
           end
         end
 
         @job.vm_type = vm_type
+        @job.vm_extensions = vm_extensions
         @job.stemcell = stemcell
         @job.env = Env.new(env_hash)
       end
@@ -290,14 +339,14 @@ module Bosh::Director
           static_ips = network.static_ips
           if static_ips && static_ips.size != job_size
             raise JobNetworkInstanceIpMismatch,
-              "Job `#{@job.name}' has #{job_size} instances but was allocated #{static_ips.size} static IPs"
+              "Instance group '#{@job.name}' has #{job_size} instances but was allocated #{static_ips.size} static IPs"
           end
         end
 
         instance_states.each_pair do |index_or_id, state|
           unless Job::VALID_JOB_STATES.include?(state)
             raise JobInvalidInstanceState,
-              "Invalid state `#{state}' for `#{@job.name}/#{index_or_id}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
+              "Invalid state '#{state}' for '#{@job.name}/#{index_or_id}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
           end
 
           @job.instance_states[index_or_id] = state
@@ -305,7 +354,7 @@ module Bosh::Director
 
         if @job.state && !Job::VALID_JOB_STATES.include?(@job.state)
           raise JobInvalidJobState,
-            "Invalid state `#{@job.state}' for `#{@job.name}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
+            "Invalid state '#{@job.state}' for '#{@job.name}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
         end
 
         job_size.times.map { DesiredInstance.new(@job, @deployment) }
@@ -319,8 +368,8 @@ module Bosh::Director
           unless az.nil?
             unless @job.availability_zones.to_a.map(&:name).include?(az)
               raise DeploymentInvalidMigratedFromJob,
-              "Job '#{name}' specified for migration to job '#{@job.name}' refers to availability zone '#{az}'. " +
-                "Az '#{az}' is not in the list of availability zones of job '#{@job.name}'."
+              "Instance group '#{name}' specified for migration to instance group '#{@job.name}' refers to availability zone '#{az}'. " +
+                "Az '#{az}' is not in the list of availability zones of instance group '#{@job.name}'."
             end
           end
           @job.migrated_from << MigratedFromJob.new(name, az)
@@ -333,20 +382,20 @@ module Bosh::Director
         jobs_property = safe_property(@job_spec, 'jobs', optional: true)
 
         if template_property && templates_property
-          raise JobInvalidTemplates, "Job `#{@job.name}' specifies both template and templates keys, only one is allowed"
+          raise JobInvalidTemplates, "Instance group '#{@job.name}' specifies both template and templates keys, only one is allowed"
         end
 
         if templates_property && jobs_property
-          raise JobInvalidTemplates, "Job `#{@job.name}' specifies both templates and jobs keys, only one is allowed"
+          raise JobInvalidTemplates, "Instance group '#{@job.name}' specifies both templates and jobs keys, only one is allowed"
         end
 
         if template_property && jobs_property
-          raise JobInvalidTemplates, "Job `#{@job.name}' specifies both template and jobs keys, only one is allowed"
+          raise JobInvalidTemplates, "Instance group '#{@job.name}' specifies both template and jobs keys, only one is allowed"
         end
 
         if [template_property, templates_property, jobs_property].compact.empty?
           raise ValidationMissingField,
-                "Job `#{@job.name}' does not specify template, templates, or jobs keys, one is required"
+                "Instance group '#{@job.name}' does not specify template, templates, or jobs keys, one is required"
         end
       end
 
@@ -356,6 +405,15 @@ module Bosh::Director
           @job.default_network[property] = network.name if network
         end
       end
+
+      def check_remove_dev_tools
+        if Config.remove_dev_tools
+          @job.env.spec['bosh'] ||= {}
+          unless @job.env.spec['bosh'].has_key?('remove_dev_tools')
+            @job.env.spec['bosh']['remove_dev_tools'] = Config.remove_dev_tools
+          end
+        end
+      end
     end
   end
 end