bosh-director 1.3232.24.0 → 1.3262.0

data/lib/bosh/director/permission_authorizer.rb

@@ -18,7 +18,7 @@ module Bosh::Director
       expected_scope = director_permissions[:admin]
 
       if subject.instance_of? Models::Deployment
-        expected_scope << deployment_team_scopes(subject, 'admin')
+        expected_scope << subject_team_scopes(subject, 'admin')
 
         if :admin == permission
           # already allowed with initial expected_scope
@@ -40,6 +40,16 @@ module Bosh::Director
         else
           raise ArgumentError, "Unexpected permission for director: #{permission}"
         end
+      elsif subject.instance_of?(Models::Task)
+        expected_scope << subject_team_scopes(subject, 'admin')
+
+        if :admin == permission
+          # already allowed with initial expected_scope
+        elsif :read == permission
+          expected_scope << director_permissions[:read]
+        else
+          raise ArgumentError, "Unexpected permission for task: #{permission}"
+        end
       else
         raise ArgumentError, "Unexpected subject: #{subject}"
       end
@@ -62,9 +72,9 @@ module Bosh::Director
       }
     end
 
-    def deployment_team_scopes(deployment, permission)
-      permissions = deployment.teams.nil? ? [] : deployment.teams.split(',')
-      permissions.map{ |team_name| "bosh.teams.#{team_name}.#{permission}" }
+    def subject_team_scopes(subject, permission)
+      teams = subject.teams.nil? ? [] : subject.teams
+      teams.map{ |team| "bosh.teams.#{team.name}.#{permission}" }
     end
 
     def intersect(valid_scopes, token_scopes)

data/lib/bosh/director/post_deployment_script_runner.rb

@@ -26,8 +26,10 @@ module Bosh::Director
     def self.run_post_deploys_after_deployment(deployment_plan)
       return unless Config.enable_post_deploy
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
-        deployment_plan.jobs.each do |job|
-          job.instances.select{|instance| instance.model[:vm_cid] != nil && instance.model.state != "stopped"}.each do |instance|
+        deployment_plan.instance_groups.each do |job|
+          # No ignored instances will ever come to this point as they were filtered out earlier
+          # BUT JUST IN CASE, check for the ignore flag
+          job.instances.select{|instance| instance.model[:vm_cid] != nil && instance.model.state != "stopped" && !instance.model.ignore}.each do |instance|
             pool.process do
               instance.agent_client.run_script('post-deploy', {})
             end
@@ -35,6 +37,5 @@ module Bosh::Director
         end
       end
     end
-
   end
-end
+end

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

@@ -3,7 +3,7 @@ module Bosh::Director
     class MissingVM < Base
 
       register_as :missing_vm
-      auto_resolution :recreate_vm
+      auto_resolution :recreate_vm_skip_post_start
 
       def initialize(instance_id, data)
         super
@@ -15,8 +15,13 @@ module Bosh::Director
         action { }
       end
 
+      resolution :recreate_vm_skip_post_start do
+        plan { "Recreate VM for '#{@instance}' without waiting for processes to start" }
+        action { recreate_vm_skip_post_start(@instance) }
+      end
+
       resolution :recreate_vm do
-        plan { "Recreate VM for '#{@instance}'" }
+        plan { "Recreate VM for '#{@instance}' and wait for processes to start" }
         action { recreate_vm(@instance) }
       end
 

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

@@ -32,11 +32,21 @@ module Bosh::Director
         action { validate; reboot_vm(@instance) }
       end
 
+      resolution :recreate_vm_skip_post_start do
+        plan { "Recreate VM for '#{@instance}' without waiting for processes to start" }
+        action { validate; recreate_vm_skip_post_start(@instance) }
+      end
+
       resolution :recreate_vm do
-        plan { "Recreate VM for '#{@instance}'" }
+        plan { "Recreate VM for '#{@instance}' and wait for processes to start" }
         action { validate; recreate_vm(@instance) }
       end
 
+      resolution :delete_vm do
+        plan { 'Delete VM' }
+        action { validate; delete_vm_from_cloud(@instance) }
+      end
+
       resolution :delete_vm_reference do
         plan { 'Delete VM reference (forceful; may need to manually delete VM from the Cloud to avoid IP conflicts)' }
         action { validate; delete_vm_reference(@instance) }

data/lib/bosh/director/problem_resolver.rb

@@ -61,7 +61,7 @@ module Bosh::Director
       resolution_summary ||= 'no resolution'
 
       begin
-        track_and_log("#{problem_summary}: #{resolution_summary}") do
+        track_and_log("#{problem.description} (#{problem_summary}): #{resolution_summary}") do
           handler.apply_resolution(resolution)
         end
       rescue Bosh::Director::ProblemHandlerError => e

data/lib/bosh/director/problem_scanner/disk_scan_stage.rb

@@ -11,7 +11,7 @@ module Bosh::Director::ProblemScanner
 
     def scan
       disks = Bosh::Director::Models::PersistentDisk.eager(:instance).all.select do |disk|
-        disk.instance && disk.instance.deployment_id == @deployment_id
+        disk.instance && disk.instance.deployment_id == @deployment_id && !disk.instance.ignore
       end
 
       results = Hash.new(0)

data/lib/bosh/director/problem_scanner/vm_scan_stage.rb

@@ -31,6 +31,7 @@ module Bosh::Director
       @event_logger.track_and_log('Checking VM states') do
         ThreadPool.new(max_threads: Config.max_threads).wrap do |pool|
           instances.each do |instance|
+            next if instance.ignore
             pool.process do
               scan_result = scan_vm(instance)
               lock.synchronize { results[scan_result] += 1 }
@@ -39,10 +40,13 @@ module Bosh::Director
         end
       end
 
+      ignored_instances_count = instances.count(&:ignore)
+
       @event_logger.track_and_log("#{results[:ok]} OK, " +
         "#{results[:unresponsive]} unresponsive, " +
         "#{results[:missing]} missing, " +
-        "#{results[:unbound]} unbound")
+        "#{results[:unbound]} unbound" +
+        (ignored_instances_count>0 ? ", #{ignored_instances_count} ignored" : ''))
     end
 
     private

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3232.24.0'
+    VERSION = '1.3262.0'
   end
 end

data/lib/bosh/director/vm_deleter.rb

@@ -1,32 +1,33 @@
 module Bosh::Director
   class VmDeleter
-    def initialize(cloud, logger, options={})
+    def initialize(cloud, logger, force=false, enable_virtual_delete_vm=false)
       @cloud = cloud
       @logger = logger
-
-      force = options.fetch(:force, false)
       @error_ignorer = ErrorIgnorer.new(force, @logger)
+      @enable_virtual_delete_vm = enable_virtual_delete_vm
     end
 
-    def delete_for_instance(instance)
+    def delete_for_instance(instance, store_event=true)
       if instance.vm_cid
         begin
           vm_cid = instance.vm_cid
           instance_name = "#{instance.job}/#{instance.uuid}"
-          parent_id = add_event(instance.deployment.name, instance_name, vm_cid)
+          parent_id = add_event(instance.deployment.name, instance_name, vm_cid) if store_event
           delete_vm(instance.vm_cid)
           instance.update(vm_cid: nil, agent_id: nil, trusted_certs_sha1: nil, credentials: nil)
         rescue Exception => e
           raise e
         ensure
-          add_event(instance.deployment.name, instance_name, vm_cid, parent_id, e)
+          add_event(instance.deployment.name, instance_name, vm_cid, parent_id, e) if store_event
         end
       end
     end
 
     def delete_vm(vm_cid)
       @logger.info('Deleting VM')
-      @error_ignorer.with_force_check { @cloud.delete_vm(vm_cid) }
+      @error_ignorer.with_force_check do
+        @cloud.delete_vm(vm_cid) unless @enable_virtual_delete_vm
+      end
     end
 
     private

data/lib/bosh/director/worker.rb

@@ -19,6 +19,7 @@ module Bosh::Director
 
       @delayed_job_worker = nil
       queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')
+      queues << @config.director_pool unless @config.director_pool.nil? || (queues - ['urgent']).empty?
 
       @delayed_job_worker = Delayed::Worker.new({:queues => queues})
       trap('USR1') {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3232.24.0
+  version: 1.3262.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-06-23 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.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3232.24.0
+        version: 1.3262.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -374,20 +374,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -408,14 +394,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -659,6 +645,11 @@ files:
 - db/migrations/director/20160329201256_set_instances_with_nil_serial_to_false.rb
 - db/migrations/director/20160331225404_backfill_stemcell_os.rb
 - db/migrations/director/20160411104407_add_task_started_at.rb
+- db/migrations/director/20160414183654_set_teams_on_task.rb
+- db/migrations/director/20160427164345_add_teams.rb
+- db/migrations/director/20160511191928_ephemeral_blobs.rb
+- db/migrations/director/20160513102035_add_tracking_to_instance.rb
+- db/migrations/director/20160531164756_add_local_dns_blobs.rb
 - db/migrations/director/20160614182106_change_text_to_longtext_for_mysql.rb
 - db/migrations/director/20160615192201_change_text_to_longtext_for_mysql_for_additional_fields.rb
 - db/migrations/dns/20120123234908_initial.rb
@@ -688,6 +679,7 @@ files:
 - lib/bosh/director/api/controllers/task_controller.rb
 - lib/bosh/director/api/controllers/tasks_controller.rb
 - lib/bosh/director/api/controllers/users_controller.rb
+- lib/bosh/director/api/controllers/vms_controller.rb
 - lib/bosh/director/api/deployment_lookup.rb
 - lib/bosh/director/api/deployment_manager.rb
 - lib/bosh/director/api/director_uuid_provider.rb
@@ -695,6 +687,7 @@ files:
 - lib/bosh/director/api/extensions/scoping.rb
 - lib/bosh/director/api/extensions/syslog_request_logger.rb
 - lib/bosh/director/api/http_constants.rb
+- lib/bosh/director/api/instance_ignore_manager.rb
 - lib/bosh/director/api/instance_lookup.rb
 - lib/bosh/director/api/instance_manager.rb
 - lib/bosh/director/api/local_identity_provider.rb
@@ -719,6 +712,7 @@ files:
 - lib/bosh/director/arp_flusher.rb
 - lib/bosh/director/blob_util.rb
 - lib/bosh/director/blobstores.rb
+- lib/bosh/director/cidr_range_combiner.rb
 - lib/bosh/director/cloudcheck_helper.rb
 - lib/bosh/director/compile_task.rb
 - lib/bosh/director/compile_task_generator.rb
@@ -755,6 +749,8 @@ files:
 - lib/bosh/director/deployment_plan/env.rb
 - lib/bosh/director/deployment_plan/global_network_resolver.rb
 - lib/bosh/director/deployment_plan/instance.rb
+- lib/bosh/director/deployment_plan/instance_group.rb
+- lib/bosh/director/deployment_plan/instance_group_spec_parser.rb
 - lib/bosh/director/deployment_plan/instance_network_reservations.rb
 - lib/bosh/director/deployment_plan/instance_plan.rb
 - lib/bosh/director/deployment_plan/instance_plan_factory.rb
@@ -766,12 +762,10 @@ files:
 - lib/bosh/director/deployment_plan/ip_provider/in_memory_ip_repo.rb
 - lib/bosh/director/deployment_plan/ip_provider/ip_provider.rb
 - lib/bosh/director/deployment_plan/ip_provider/ip_provider_factory.rb
-- lib/bosh/director/deployment_plan/job.rb
 - lib/bosh/director/deployment_plan/job_availability_zone_parser.rb
 - lib/bosh/director/deployment_plan/job_migrator.rb
 - lib/bosh/director/deployment_plan/job_network.rb
 - lib/bosh/director/deployment_plan/job_network_parser.rb
-- lib/bosh/director/deployment_plan/job_spec_parser.rb
 - lib/bosh/director/deployment_plan/links/link.rb
 - lib/bosh/director/deployment_plan/links/link_lookup.rb
 - lib/bosh/director/deployment_plan/links/link_path.rb
@@ -816,6 +810,7 @@ files:
 - lib/bosh/director/deployment_plan/vm_extension.rb
 - lib/bosh/director/deployment_plan/vm_type.rb
 - lib/bosh/director/disk_manager.rb
+- lib/bosh/director/dns/blobstore_dns_publisher.rb
 - lib/bosh/director/dns/canonicalizer.rb
 - lib/bosh/director/dns/dns_manager.rb
 - lib/bosh/director/dns/local_dns_repo.rb
@@ -859,11 +854,14 @@ files:
 - lib/bosh/director/jobs/delete_release.rb
 - lib/bosh/director/jobs/delete_snapshots.rb
 - lib/bosh/director/jobs/delete_stemcell.rb
+- lib/bosh/director/jobs/delete_vm.rb
 - lib/bosh/director/jobs/export_release.rb
 - lib/bosh/director/jobs/fetch_logs.rb
 - lib/bosh/director/jobs/helpers.rb
 - lib/bosh/director/jobs/helpers/blob_deleter.rb
 - lib/bosh/director/jobs/helpers/compiled_package_deleter.rb
+- lib/bosh/director/jobs/helpers/config_parser.rb
+- lib/bosh/director/jobs/helpers/deep_hash_replacement.rb
 - lib/bosh/director/jobs/helpers/name_version_release_deleter.rb
 - lib/bosh/director/jobs/helpers/package_deleter.rb
 - lib/bosh/director/jobs/helpers/release_deleter.rb
@@ -886,6 +884,7 @@ files:
 - lib/bosh/director/jobs/update_stemcell.rb
 - lib/bosh/director/jobs/vm_state.rb
 - lib/bosh/director/key_generator.rb
+- lib/bosh/director/legacy_deployment_helper.rb
 - lib/bosh/director/lock.rb
 - lib/bosh/director/lock_helper.rb
 - lib/bosh/director/log_bundles_cleaner.rb
@@ -903,10 +902,12 @@ files:
 - lib/bosh/director/models/dns.rb
 - lib/bosh/director/models/dns/domain.rb
 - lib/bosh/director/models/dns/record.rb
+- lib/bosh/director/models/ephemeral_blob.rb
 - lib/bosh/director/models/event.rb
 - lib/bosh/director/models/helpers/model_helper.rb
 - lib/bosh/director/models/instance.rb
 - lib/bosh/director/models/ip_address.rb
+- lib/bosh/director/models/local_dns_blob.rb
 - lib/bosh/director/models/lock.rb
 - lib/bosh/director/models/log_bundle.rb
 - lib/bosh/director/models/orphan_disk.rb
@@ -920,6 +921,7 @@ files:
 - lib/bosh/director/models/snapshot.rb
 - lib/bosh/director/models/stemcell.rb
 - lib/bosh/director/models/task.rb
+- lib/bosh/director/models/team.rb
 - lib/bosh/director/models/template.rb
 - lib/bosh/director/models/user.rb
 - lib/bosh/director/nats_rpc.rb