bosh-director-core 1.2583.0 → 1.2596.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/bosh/director/core/templates/job_instance_renderer.rb +3 -5
- data/lib/bosh/director/core/templates/job_template_loader.rb +1 -3
- data/lib/bosh/director/core/templates/job_template_renderer.rb +3 -8
- data/lib/bosh/director/core/templates/rendered_job_instance.rb +4 -7
- data/lib/bosh/director/core/version.rb +1 -1
- metadata +5 -5
@@ -9,7 +9,7 @@ module Bosh::Director::Core::Templates
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def render(spec)
|
12
|
-
rendered_templates = templates.map do |template|
|
12
|
+
rendered_templates = @templates.map do |template|
|
13
13
|
job_template_renderer = job_template_renderers[template.name]
|
14
14
|
job_template_renderer.render(spec)
|
15
15
|
end
|
@@ -20,12 +20,10 @@ module Bosh::Director::Core::Templates
|
|
20
20
|
private
|
21
21
|
|
22
22
|
def job_template_renderers
|
23
|
-
@job_template_renderers ||= templates.reduce({}) do |hash, template|
|
24
|
-
hash[template.name] = job_template_loader.process(template)
|
23
|
+
@job_template_renderers ||= @templates.reduce({}) do |hash, template|
|
24
|
+
hash[template.name] = @job_template_loader.process(template)
|
25
25
|
hash
|
26
26
|
end
|
27
27
|
end
|
28
|
-
|
29
|
-
attr_reader :job_template_loader, :templates
|
30
28
|
end
|
31
29
|
end
|
@@ -22,15 +22,13 @@ module Bosh::Director::Core::Templates
|
|
22
22
|
source_erbs << SourceErb.new(src_name, dest_name, erb_file, job_template.name)
|
23
23
|
end
|
24
24
|
|
25
|
-
JobTemplateRenderer.new(job_template.name, monit_source_erb, source_erbs, logger)
|
25
|
+
JobTemplateRenderer.new(job_template.name, monit_source_erb, source_erbs, @logger)
|
26
26
|
ensure
|
27
27
|
FileUtils.rm_rf(template_dir) if template_dir
|
28
28
|
end
|
29
29
|
|
30
30
|
private
|
31
31
|
|
32
|
-
attr_reader :logger
|
33
|
-
|
34
32
|
def extract_template(job_template)
|
35
33
|
temp_path = job_template.download_blob
|
36
34
|
template_dir = Dir.mktmpdir('template_dir')
|
@@ -5,7 +5,6 @@ require 'common/properties'
|
|
5
5
|
|
6
6
|
module Bosh::Director::Core::Templates
|
7
7
|
class JobTemplateRenderer
|
8
|
-
|
9
8
|
attr_reader :monit_erb, :source_erbs
|
10
9
|
|
11
10
|
def initialize(name, monit_erb, source_erbs, logger)
|
@@ -20,18 +19,14 @@ module Bosh::Director::Core::Templates
|
|
20
19
|
job_name = spec['job']['name']
|
21
20
|
index = spec['index']
|
22
21
|
|
23
|
-
monit = monit_erb.render(template_context, job_name, index, logger)
|
22
|
+
monit = monit_erb.render(template_context, job_name, index, @logger)
|
24
23
|
|
25
24
|
rendered_files = source_erbs.map do |source_erb|
|
26
|
-
file_contents = source_erb.render(template_context, job_name, index, logger)
|
25
|
+
file_contents = source_erb.render(template_context, job_name, index, @logger)
|
27
26
|
RenderedFileTemplate.new(source_erb.src_name, source_erb.dest_name, file_contents)
|
28
27
|
end
|
29
28
|
|
30
|
-
RenderedJobTemplate.new(name, monit, rendered_files)
|
29
|
+
RenderedJobTemplate.new(@name, monit, rendered_files)
|
31
30
|
end
|
32
|
-
|
33
|
-
private
|
34
|
-
|
35
|
-
attr_reader :name, :logger
|
36
31
|
end
|
37
32
|
end
|
@@ -12,7 +12,8 @@ module Bosh::Director::Core::Templates
|
|
12
12
|
|
13
13
|
def configuration_hash
|
14
14
|
instance_digest = Digest::SHA1.new
|
15
|
-
|
15
|
+
|
16
|
+
@job_templates.sort { |x, y| x.name <=> y.name }.each do |rendered_job_template|
|
16
17
|
bound_templates = ''
|
17
18
|
bound_templates << rendered_job_template.monit
|
18
19
|
|
@@ -26,7 +27,7 @@ module Bosh::Director::Core::Templates
|
|
26
27
|
end
|
27
28
|
|
28
29
|
def template_hashes
|
29
|
-
job_templates.reduce({}) do |h, rendered_job_template|
|
30
|
+
@job_templates.reduce({}) do |h, rendered_job_template|
|
30
31
|
h.merge(rendered_job_template.name => rendered_job_template.template_hash)
|
31
32
|
end
|
32
33
|
end
|
@@ -35,16 +36,12 @@ module Bosh::Director::Core::Templates
|
|
35
36
|
file = Tempfile.new('compressed-rendered-job-templates')
|
36
37
|
|
37
38
|
compressed_archive = CompressedRenderedJobTemplates.new(file.path)
|
38
|
-
compressed_archive.write(job_templates)
|
39
|
+
compressed_archive.write(@job_templates)
|
39
40
|
|
40
41
|
blobstore_id = blobstore.create(compressed_archive.contents)
|
41
42
|
RenderedTemplatesArchive.new(blobstore_id, compressed_archive.sha1)
|
42
43
|
ensure
|
43
44
|
file.close!
|
44
45
|
end
|
45
|
-
|
46
|
-
private
|
47
|
-
|
48
|
-
attr_reader :job_templates
|
49
46
|
end
|
50
47
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bosh-director-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.2596.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-06-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bosh_common
|
@@ -18,7 +18,7 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 1.
|
21
|
+
version: 1.2596.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ~>
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 1.
|
29
|
+
version: 1.2596.0
|
30
30
|
description: Bosh::Director::Core provides common Director code for Director and Microbosh
|
31
31
|
Deployer
|
32
32
|
email: support@cloudfoundry.com
|
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
69
69
|
version: '0'
|
70
70
|
segments:
|
71
71
|
- 0
|
72
|
-
hash:
|
72
|
+
hash: 2538969673950386571
|
73
73
|
requirements: []
|
74
74
|
rubyforge_project:
|
75
75
|
rubygems_version: 1.8.23.2
|