bosh-director 1.3137.0 → 1.3138.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/blob_util.rb +2 -3
  3. data/lib/bosh/director/deployment_plan/deployment_spec_parser.rb +2 -1
  4. data/lib/bosh/director/instance_updater/vm_updater.rb +0 -2
  5. data/lib/bosh/director/jobs/update_release.rb +10 -7
  6. data/lib/bosh/director/version.rb +1 -1
  7. metadata +16 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 248703d15229ac586854892a69b766baeebad0b3
4
- data.tar.gz: 09fad2f07538ac769af1f976f0cb3fdb31bc4fd2
3
+ metadata.gz: 2d53c72ce355df501653a7710e3219443385b4ab
4
+ data.tar.gz: 4dabb374ff6da9561e50d6ebd9461935d5aba13b
5
5
  SHA512:
6
- metadata.gz: 633b3ad6e20f78fe763758bf6b609e8db69249a3923adcb7c62443b17aa77d5a76e69a309565764567a81b361410aa0c7e0d61a5cd8ebbb921d662ace6750e04
7
- data.tar.gz: 580465eccf15ebcf71faa96746a1e14fcc3df8b2f08f13b1e99c2780e5ec9a5f99facaef960eed84e4ced4fd3565140fbe5cf5155c6fec375eaa3b55d9e1a406
6
+ metadata.gz: e7bd8ad5ebcebd2e56a4c5a544041e03e86adbf8594782fd8bf68f4f650cabd490f8f3bdc48cba9a4aeab9b2e465e30a3266ea8f3bf54585289beaa8e017bd06
7
+ data.tar.gz: 3308c71035950b31ad17ac054de5045a3493435ea631da55944fb66aab4a278463fb9d741d61be1d3239589573670ced02a6ba0f8cd230059c593552ae2eeb1b
data/lib/bosh/director/blob_util.rb CHANGED
@@ -22,9 +22,8 @@ module Bosh::Director
22
22
  blobstore_id
23
23
  end
24
24
 
25
- def self.replace_blob(old_blobstore_id, path)
26
- blobstore.delete(old_blobstore_id) if blobstore.exists?(old_blobstore_id)
27
- return create_blob path
25
+ def self.delete_blob(blobstore_id)
26
+ blobstore.delete(blobstore_id)
28
27
  end
29
28
 
30
29
  def self.save_to_global_cache(compiled_package, cache_key)
data/lib/bosh/director/deployment_plan/deployment_spec_parser.rb CHANGED
@@ -64,7 +64,8 @@ module Bosh::Director
64
64
  def parse_jobs
65
65
  jobs = safe_property(@deployment_manifest, 'jobs', :class => Array, :default => [])
66
66
  jobs.each do |job_spec|
67
- state_overrides = @job_states.fetch(job_spec['name'], {})
67
+ # get state specific for this job or all jobs
68
+ state_overrides = @job_states.fetch(job_spec['name'], @job_states.fetch('*', {}))
68
69
  job_spec = job_spec.recursive_merge(state_overrides)
69
70
  @deployment.add_job(Job.parse(@deployment, job_spec, @event_log, @logger))
70
71
  end
data/lib/bosh/director/instance_updater/vm_updater.rb CHANGED
@@ -55,8 +55,6 @@ module Bosh::Director
55
55
 
56
56
  vm_deleter = VmDeleter.new(@instance, @vm_model, @cloud, @logger)
57
57
  vm_deleter.delete
58
-
59
- @instance.job.resource_pool.add_idle_vm
60
58
  end
61
59
 
62
60
  def attach_missing_disk
data/lib/bosh/director/jobs/update_release.rb CHANGED
@@ -490,22 +490,20 @@ module Bosh::Director
490
490
  package_tgz = File.join(release_dir, 'packages', "#{name}.tgz")
491
491
 
492
492
  if @fix
493
+ package.sha1 = package_meta['sha1']
494
+
493
495
  if package.blobstore_id != nil
494
- logger.info("Verifying package #{desc} with blobstore_id: #{package.blobstore_id}")
495
496
  validate_tgz(package_tgz, desc)
496
497
  fix_package(package, package_tgz)
497
498
  return true
498
499
  end
499
- package.sha1 = package_meta['sha1']
500
500
 
501
501
  if existing_blob
502
502
  pkg = Models::Package.where(blobstore_id: existing_blob).first
503
- logger.info("Verifying package #{desc} with blobstore_id: #{existing_blob}")
504
503
  fix_package(pkg, package_tgz)
505
504
  package.blobstore_id = BlobUtil.copy_blob(pkg.blobstore_id)
506
505
  return true
507
506
  end
508
-
509
507
  else
510
508
  return false unless package.blobstore_id.nil?
511
509
  package.sha1 = package_meta['sha1']
@@ -638,10 +636,15 @@ module Bosh::Director
638
636
  end
639
637
 
640
638
  def fix_package(package, package_tgz)
641
- single_step_stage("Fixing package '#{package.name}/#{package.version}'") do
642
- logger.info("Fixing package '#{package.name}/#{package.version}'")
643
- package.blobstore_id = BlobUtil.replace_blob(package.blobstore_id, package_tgz)
639
+ begin
640
+ logger.info("Deleting package '#{package.name}/#{package.version}'")
641
+ BlobUtil.delete_blob(package.blobstore_id)
642
+ rescue Bosh::Blobstore::BlobstoreError => e
643
+ logger.info("Error deleting blob '#{package.blobstore_id}, #{package.name}/#{package.version}': #{e.inspect}")
644
644
  end
645
+ package.blobstore_id = BlobUtil.create_blob(package_tgz)
646
+ logger.info("Re-created package '#{package.name}/#{package.version}' \
647
+ with blobstore_id '#{package.blobstore_id}'")
645
648
  end
646
649
  end
647
650
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.3137.0'
3
+ VERSION = '1.3138.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3137.0
4
+ version: 1.3138.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-13 00:00:00.000000000 Z
11
+ date: 2015-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.3137.0
19
+ version: 1.3138.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.3137.0
26
+ version: 1.3138.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh_cpi
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3137.0
33
+ version: 1.3138.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.3137.0
40
+ version: 1.3138.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-registry
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3137.0
47
+ version: 1.3138.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.3137.0
54
+ version: 1.3138.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: blobstore_client
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3137.0
61
+ version: 1.3138.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.3137.0
68
+ version: 1.3138.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh-core
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.3137.0
75
+ version: 1.3138.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.3137.0
82
+ version: 1.3138.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-director-core
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.3137.0
89
+ version: 1.3138.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.3137.0
96
+ version: 1.3138.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh-template
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3137.0
103
+ version: 1.3138.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.3137.0
110
+ version: 1.3138.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement