bosh-director 1.3173.0 → 1.3177.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/db/migrations/director/20151229184742_add_vm_attributes_to_instance.rb +25 -0
  3. data/db/migrations/director/20160108191637_drop_vm_env_json_from_instance.rb +7 -0
  4. data/lib/bosh/director/api/controllers/base_controller.rb +1 -1
  5. data/lib/bosh/director/api/controllers/deployments_controller.rb +1 -1
  6. data/lib/bosh/director/api/deployment_manager.rb +10 -12
  7. data/lib/bosh/director/api/instance_manager.rb +5 -6
  8. data/lib/bosh/director/api/snapshot_manager.rb +1 -2
  9. data/lib/bosh/director/cloudcheck_helper.rb +30 -52
  10. data/lib/bosh/director/config.rb +2 -1
  11. data/lib/bosh/director/deployment_deleter.rb +0 -21
  12. data/lib/bosh/director/deployment_plan.rb +1 -1
  13. data/lib/bosh/director/deployment_plan/agent_state_migrator.rb +7 -19
  14. data/lib/bosh/director/deployment_plan/assembler.rb +6 -30
  15. data/lib/bosh/director/deployment_plan/compilation_instance_pool.rb +2 -4
  16. data/lib/bosh/director/deployment_plan/dynamic_network.rb +1 -1
  17. data/lib/bosh/director/deployment_plan/instance.rb +6 -46
  18. data/lib/bosh/director/deployment_plan/instance_network_reservations.rb +13 -13
  19. data/lib/bosh/director/deployment_plan/instance_plan.rb +3 -3
  20. data/lib/bosh/director/deployment_plan/instance_plan_factory.rb +12 -4
  21. data/lib/bosh/director/deployment_plan/instance_planner.rb +5 -4
  22. data/lib/bosh/director/deployment_plan/instance_repository.rb +7 -14
  23. data/lib/bosh/director/deployment_plan/instance_spec.rb +2 -2
  24. data/lib/bosh/director/deployment_plan/ip_provider/database_ip_repo.rb +7 -7
  25. data/lib/bosh/director/deployment_plan/ip_provider/in_memory_ip_repo.rb +6 -3
  26. data/lib/bosh/director/deployment_plan/ip_provider/ip_provider.rb +4 -4
  27. data/lib/bosh/director/deployment_plan/job.rb +0 -7
  28. data/lib/bosh/director/deployment_plan/job_migrator.rb +3 -2
  29. data/lib/bosh/director/deployment_plan/manual_network_subnet.rb +1 -1
  30. data/lib/bosh/director/deployment_plan/network_planner/planner.rb +2 -2
  31. data/lib/bosh/director/deployment_plan/network_reservation_repository.rb +20 -0
  32. data/lib/bosh/director/deployment_plan/placement_planner/static_ips_availability_zone_picker.rb +2 -1
  33. data/lib/bosh/director/deployment_plan/planner.rb +2 -17
  34. data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb +1 -1
  35. data/lib/bosh/director/deployment_plan/steps/update_step.rb +1 -21
  36. data/lib/bosh/director/disk_manager.rb +8 -8
  37. data/lib/bosh/director/dns/dns_manager.rb +76 -20
  38. data/lib/bosh/director/errand/job_manager.rb +1 -1
  39. data/lib/bosh/director/instance_deleter.rb +1 -3
  40. data/lib/bosh/director/instance_updater.rb +4 -3
  41. data/lib/bosh/director/job_updater.rb +10 -2
  42. data/lib/bosh/director/jobs/base_job.rb +1 -1
  43. data/lib/bosh/director/jobs/cloud_check/scan_and_fix.rb +3 -3
  44. data/lib/bosh/director/jobs/create_snapshot.rb +1 -1
  45. data/lib/bosh/director/jobs/delete_deployment.rb +1 -1
  46. data/lib/bosh/director/jobs/delete_deployment_snapshots.rb +1 -1
  47. data/lib/bosh/director/jobs/snapshot_deployment.rb +2 -2
  48. data/lib/bosh/director/jobs/vm_state.rb +16 -17
  49. data/lib/bosh/director/models.rb +0 -1
  50. data/lib/bosh/director/models/deployment.rb +0 -3
  51. data/lib/bosh/director/models/instance.rb +17 -10
  52. data/lib/bosh/director/network_reservation.rb +15 -16
  53. data/lib/bosh/director/problem_handlers/inactive_disk.rb +4 -6
  54. data/lib/bosh/director/problem_handlers/missing_disk.rb +3 -5
  55. data/lib/bosh/director/problem_handlers/missing_vm.rb +8 -10
  56. data/lib/bosh/director/problem_handlers/mount_info_mismatch.rb +8 -3
  57. data/lib/bosh/director/problem_handlers/unresponsive_agent.rb +14 -29
  58. data/lib/bosh/director/problem_scanner/disk_scan_stage.rb +1 -4
  59. data/lib/bosh/director/problem_scanner/problem_register.rb +2 -4
  60. data/lib/bosh/director/problem_scanner/scanner.rb +1 -1
  61. data/lib/bosh/director/problem_scanner/vm_scan_stage.rb +17 -35
  62. data/lib/bosh/director/stopper.rb +2 -2
  63. data/lib/bosh/director/version.rb +1 -1
  64. data/lib/bosh/director/vm_creator.rb +15 -33
  65. data/lib/bosh/director/vm_deleter.rb +6 -8
  66. data/lib/bosh/director/vm_metadata_updater.rb +5 -7
  67. data/lib/bosh/director/vm_recreator.rb +3 -2
  68. metadata +19 -18
  69. data/lib/bosh/director/deployment_plan/vm.rb +0 -22
  70. data/lib/bosh/director/models/vm.rb +0 -38
@@ -1,22 +0,0 @@
1
- module Bosh::Director
2
- module DeploymentPlan
3
- ##
4
- # Represents a resource pool VM.
5
- #
6
- # It represents a VM until it's officially bound to an instance. It can be
7
- # reserved for an instance to minimize the number of CPI operations
8
- # (network & storage) required for the VM to match the instance
9
- # requirements.
10
- class Vm
11
- # @return [Models::Vm] Associated DB model
12
- attr_accessor :model
13
-
14
- # @return [DeploymentPlan::Instance, nil] Instance that reserved this VM
15
- attr_accessor :bound_instance
16
-
17
- def clean
18
- self.model = nil
19
- end
20
- end
21
- end
22
- end
@@ -1,38 +0,0 @@
1
- module Bosh::Director::Models
2
- class Vm < Sequel::Model(Bosh::Director::Config.db)
3
- many_to_one :deployment
4
- one_to_one :instance
5
-
6
- def validate
7
- validates_presence [:deployment_id, :agent_id]
8
- validates_unique :agent_id
9
- end
10
-
11
- def vm_exists?
12
- !(cid.nil? || cid.empty?)
13
- end
14
-
15
- # @param [Hash] env_hash Environment hash
16
- def env=(env_hash)
17
- self.env_json = Yajl::Encoder.encode(env_hash)
18
- end
19
-
20
- # @return [Hash] VM environment hash
21
- def env
22
- return nil if env_json.nil?
23
- Yajl::Parser.parse(env_json)
24
- end
25
-
26
- def credentials
27
- return nil if credentials_json.nil?
28
- Yajl::Parser.parse(credentials_json)
29
- end
30
-
31
- def credentials=(spec)
32
- self.credentials_json = Yajl::Encoder.encode(spec)
33
- end
34
- end
35
-
36
- Vm.plugin :association_dependencies
37
- Vm.add_association_dependencies :instance => :nullify
38
- end