diff --git a/client/driver/driver.go b/client/driver/driver.go index 8c03284a7..9fe213589 100644 --- a/client/driver/driver.go +++ b/client/driver/driver.go @@ -294,7 +294,7 @@ func GetTaskEnv(taskDir *allocdir.TaskDir, node *structs.Node, SetTaskMeta(alloc.Job.CombinedTaskMeta(alloc.TaskGroup, task.Name)). SetJobName(alloc.Job.Name). SetDatacenterName(node.Datacenter). - SetRegionName(node.Region). + SetRegionName(conf.Region). SetEnvvars(task.Env). SetTaskName(task.Name) diff --git a/client/driver/env/env.go b/client/driver/env/env.go index f0c12fc59..4059f7472 100644 --- a/client/driver/env/env.go +++ b/client/driver/env/env.go @@ -242,7 +242,7 @@ func (t *TaskEnvironment) Build() *TaskEnvironment { // Set up the node values. t.NodeValues[nodeIdKey] = t.Node.ID t.NodeValues[nodeDcKey] = t.Node.Datacenter - t.NodeValues[nodeRegionKey] = t.Node.Region + t.NodeValues[nodeRegionKey] = t.Region t.NodeValues[nodeNameKey] = t.Node.Name t.NodeValues[nodeClassKey] = t.Node.NodeClass diff --git a/command/agent/agent.go b/command/agent/agent.go index 6c962067c..8080591e6 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -280,7 +280,6 @@ 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 diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index 357c95332..924c39009 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -735,9 +735,6 @@ type Node struct { // Datacenter for this node Datacenter string - // Region for this node - Region string - // Node name Name string