bosh-director 1.3031.0 → 1.3033.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/deployment_plan/planner_factory.rb +28 -0
  3. data/lib/bosh/director/errors.rb +2 -0
  4. data/lib/bosh/director/jobs/export_release.rb +1 -1
  5. data/lib/bosh/director/jobs/update_release.rb +1 -1
  6. data/lib/bosh/director/version.rb +1 -1
  7. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e1538c09e8c0b9e11f6c99eebf9fd8258eb589df
4
- data.tar.gz: d6a3fd781064572f3fff7b8728ad99e90b147557
3
+ metadata.gz: e33d9d02e1fdad6c921fef85eba81325457d783a
4
+ data.tar.gz: 02ec8b58afd26b564f75b1bce643124c8ccc422f
5
5
  SHA512:
6
- metadata.gz: 3a03793459dc2dc6c86401dddcca8606f881c2cce4fbee8566d683d4efc3b4c9f65047ac779c8528c5959eb27c1fba1cb8880a79eaf39c412accd17bee994c29
7
- data.tar.gz: 6df69002eaf9e3b170c1c0d559818ddcf17ffd5d6dbb6e1588eef6178f21029c9561c08d873d03d0949db7b8539514392fc0427618d4e6c9e8f592ec4e263f43
6
+ metadata.gz: 69ccd932a27ee4003922bd34dba420ba5af82c6fe763ee79ddcfd375e2cf91ea93c68a28aa078440e22c1f313a00987164faf0059ab974a7f5ba5d3c4e2de3d2
7
+ data.tar.gz: d311220b9905560bdafa4c6414dee1e4f76394bbf9ff378c472c5b07079f79e2ab0a218523c3fab24d3dedcb0c719b4d712b2ed6fb5f453467dc230b4b3f0ed9
data/lib/bosh/director/deployment_plan/planner_factory.rb CHANGED
@@ -94,6 +94,8 @@ module Bosh
94
94
 
95
95
  run_prepare_step(assembler)
96
96
 
97
+ validate_packages(planner)
98
+
97
99
  DeploymentPlan::Steps::PackageCompileStep.new(
98
100
  planner,
99
101
  cloud,
@@ -146,6 +148,32 @@ module Bosh
146
148
  end
147
149
  end
148
150
 
151
+ def validate_packages(planner)
152
+ release_manager = Bosh::Director::Api::ReleaseManager.new
153
+ planner.jobs.each { |job|
154
+ job.templates.each{ |template|
155
+ release_model = release_manager.find_by_name(template.release.name)
156
+ template.package_models.each{ |package|
157
+
158
+ release_version_model = release_manager.find_version(release_model, template.release.version)
159
+ packages_list = release_version_model.transitive_dependencies(package)
160
+ packages_list << package
161
+
162
+ packages_list.each { |needed_package|
163
+ if needed_package.sha1.nil? || needed_package.blobstore_id.nil?
164
+ compiled_packages_list = Bosh::Director::Models::CompiledPackage[:package_id => needed_package.id, :stemcell_id => job.resource_pool.stemcell.model.id]
165
+ if compiled_packages_list.nil?
166
+ msg = "Can't deploy `#{release_version_model.release.name}/#{release_version_model.version}': it is not " +
167
+ "compiled for `#{job.resource_pool.stemcell.model.desc}' and no source package is available"
168
+ raise PackageMissingSourceCode, msg
169
+ end
170
+ end
171
+ }
172
+ }
173
+ }
174
+ }
175
+ end
176
+
149
177
  def track_and_log(message)
150
178
  @event_log.track(message) do
151
179
  @logger.info(message)
data/lib/bosh/director/errors.rb CHANGED
@@ -87,6 +87,7 @@ module Bosh::Director
87
87
  StemcellInUse = err(50004)
88
88
 
89
89
  PackageInvalidArchive = err(60000)
90
+ PackageMissingSourceCode = err(60001)
90
91
 
91
92
  # Models
92
93
  DeploymentNotFound = err(70000, NOT_FOUND)
@@ -214,6 +215,7 @@ module Bosh::Director
214
215
 
215
216
  PackageCompilationNetworkNotReserved = err(430001)
216
217
  PackageCompilationNotEnoughWorkersForReuse = err(430002)
218
+ PackageCompilationNotFound = err(430003)
217
219
 
218
220
  BadManifest = err(440001)
219
221
 
data/lib/bosh/director/jobs/export_release.rb CHANGED
@@ -70,7 +70,7 @@ module Bosh::Director
70
70
 
71
71
  def deployment_manifest_has_release?
72
72
  @deployment_manifest["releases"].each do |release|
73
- if (release["name"] == @release_name) && (release["version"] == @release_version)
73
+ if (release["name"] == @release_name) && (release["version"].to_s == @release_version.to_s)
74
74
  return true
75
75
  end
76
76
  end
data/lib/bosh/director/jobs/update_release.rb CHANGED
@@ -374,7 +374,7 @@ module Bosh::Director
374
374
  compiled_package = Models::CompiledPackage.new
375
375
 
376
376
  compiled_package.blobstore_id = BlobUtil.create_blob(tgz)
377
- compiled_package.sha1 = Digest::SHA1.hexdigest(tgz)
377
+ compiled_package.sha1 = Digest::SHA1.file(tgz).hexdigest
378
378
 
379
379
  transitive_dependencies = @release_version_model.transitive_dependencies(package)
380
380
  compiled_package.dependency_key = Models::CompiledPackage.create_dependency_key(transitive_dependencies)
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.3031.0'
3
+ VERSION = '1.3033.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.3031.0
4
+ version: 1.3033.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-07-31 00:00:00.000000000 Z
11
+ date: 2015-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3031.0
33
+ version: 1.3033.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.3031.0
40
+ version: 1.3033.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3031.0
47
+ version: 1.3033.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.3031.0
54
+ version: 1.3033.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-director-core
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3031.0
61
+ version: 1.3033.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.3031.0
68
+ version: 1.3033.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh_common
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.3031.0
75
+ version: 1.3033.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.3031.0
82
+ version: 1.3033.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-template
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.3031.0
89
+ version: 1.3033.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.3031.0
96
+ version: 1.3033.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh_cpi
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3031.0
103
+ version: 1.3033.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.3031.0
110
+ version: 1.3033.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.3031.0
117
+ version: 1.3033.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.3031.0
124
+ version: 1.3033.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: bosh_aws_cpi
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.3031.0
131
+ version: 1.3033.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.3031.0
138
+ version: 1.3033.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: bosh_vsphere_cpi
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 1.3031.0
145
+ version: 1.3033.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 1.3031.0
152
+ version: 1.3033.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_vcloud_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
572
572
  version: '0'
573
573
  description: |-
574
574
  BOSH Director
575
- 486f96
575
+ 2c1c13
576
576
  email: support@cloudfoundry.com
577
577
  executables:
578
578
  - bosh-director