mirror of
https://github.com/kemko/nomad.git
synced 2026-01-08 03:15:42 +03:00
I think I did it.
This commit is contained in:
committed by
Alex Dadgar
parent
530cf03177
commit
4a4417d556
@@ -293,10 +293,10 @@ func GetTaskEnv(taskDir *allocdir.TaskDir, node *structs.Node,
|
||||
env := env.NewTaskEnvironment(node).
|
||||
SetTaskMeta(alloc.Job.CombinedTaskMeta(alloc.TaskGroup, task.Name)).
|
||||
SetJobName(alloc.Job.Name).
|
||||
SetDatacenterName(node.Datacenter).
|
||||
SetRegionName(node.Region).
|
||||
SetEnvvars(task.Env).
|
||||
SetTaskName(task.Name)
|
||||
SetDatacenterName(node.Datacenter)
|
||||
SetRegionName(node.Region)
|
||||
|
||||
// Vary paths by filesystem isolation used
|
||||
drv, err := NewDriver(task.Driver, NewEmptyDriverContext())
|
||||
|
||||
8
client/driver/env/env.go
vendored
8
client/driver/env/env.go
vendored
@@ -520,22 +520,22 @@ func (t *TaskEnvironment) ClearJobName() *TaskEnvironment {
|
||||
}
|
||||
|
||||
func (t *TaskEnvironment) SetDatacenterName(name string) *TaskEnvironment {
|
||||
t.JobName = name
|
||||
t.Datacenter = name
|
||||
return t
|
||||
}
|
||||
|
||||
func (t *TaskEnvironment) ClearDatacenterName() *TaskEnvironment {
|
||||
t.JobName = ""
|
||||
t.Datacenter = ""
|
||||
return t
|
||||
}
|
||||
|
||||
func (t *TaskEnvironment) SetRegionName(name string) *TaskEnvironment {
|
||||
t.JobName = name
|
||||
t.Region = name
|
||||
return t
|
||||
}
|
||||
|
||||
func (t *TaskEnvironment) ClearRegionName() *TaskEnvironment {
|
||||
t.JobName = ""
|
||||
t.Region = ""
|
||||
return t
|
||||
}
|
||||
|
||||
|
||||
@@ -280,6 +280,7 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
|
||||
// Setup the node
|
||||
conf.Node = new(structs.Node)
|
||||
conf.Node.Datacenter = a.config.Datacenter
|
||||
conf.Node.Region = a.config.Region
|
||||
conf.Node.Name = a.config.NodeName
|
||||
conf.Node.Meta = a.config.Client.Meta
|
||||
conf.Node.NodeClass = a.config.Client.NodeClass
|
||||
|
||||
Reference in New Issue
Block a user