kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

alway load all templates

Browse Source
This commit is contained in:
Alex Dadgar
2017-11-10 12:35:51 -08:00
parent d93ecb90eb
commit da852ea653
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/consul_template.go
View File

@@ -218,7 +218,7 @@ func (tm *TaskTemplateManager) run() {
tm.config.Hooks.Kill(consulTemplateSourceName, err.Error(), true)
return
}
tm.config.EnvBuilder.MergeTemplateEnv(envMap)
tm.config.EnvBuilder.SetTemplateEnv(envMap)
// Unblock the task
tm.config.Hooks.UnblockStart(consulTemplateSourceName)
@@ -389,12 +389,12 @@ func (tm *TaskTemplateManager) handleTemplateRerenders(allRenderedTime time.Time
}
// Read environment variables from templates
envMap, err := loadTemplateEnv(tmpls, tm.config.TaskDir)
envMap, err := loadTemplateEnv(tm.config.Templates, tm.config.TaskDir)
if err != nil {
tm.config.Hooks.Kill(consulTemplateSourceName, err.Error(), true)
return
}
tm.config.EnvBuilder.MergeTemplateEnv(envMap)
tm.config.EnvBuilder.SetTemplateEnv(envMap)
for _, tmpl := range tmpls {
switch tmpl.ChangeMode {

12
client/driver/env/env.go vendored
View File

@@ -532,17 +532,9 @@ func (b *Builder) SetHostEnvvars(filter []string) *Builder {
return b
}
// MergeTemplateEnv is used to merge the passed environment variables with
// existing environment variables set from a template.
func (b *Builder) MergeTemplateEnv(m map[string]string) *Builder {
func (b *Builder) SetTemplateEnv(m map[string]string) *Builder {
b.mu.Lock()
if b.templateEnv == nil {
b.templateEnv = m
} else {
for k, v := range m {
b.templateEnv[k] = v
}
}
b.templateEnv = m
b.mu.Unlock()
return b
}