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

agent: working on setup

Browse Source
This commit is contained in:
Armon Dadgar
2015-08-30 18:14:40 -07:00
parent 6e9eaae68e
commit a4bb4dd655
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
command/agent/agent.go
View File

@@ -68,10 +68,16 @@ func (a *Agent) setupServer() error {
conf := nomad.DefaultConfig()
conf.LogOutput = a.logOutput
conf.DevMode = a.config.DevMode
conf.Region = a.config.Region
conf.Datacenter = a.config.Datacenter
conf.NodeName = a.config.NodeName
conf.Build = fmt.Sprintf("%s%s", a.config.Version, a.config.VersionPrerelease)
if a.config.Region != "" {
conf.Region = a.config.Region
}
if a.config.Datacenter != "" {
conf.Datacenter = a.config.Datacenter
}
if a.config.NodeName != "" {
conf.NodeName = a.config.NodeName
}
if a.config.Server.Bootstrap {
conf.Bootstrap = a.config.Server.Bootstrap
}
@@ -130,9 +136,19 @@ func (a *Agent) setupClient() error {
}
conf.LogOutput = a.logOutput
conf.DevMode = a.config.DevMode
conf.Region = a.config.Region
conf.StateDir = a.config.Client.StateDir
conf.AllocDir = a.config.Client.AllocDir
if a.config.Region != "" {
conf.Region = a.config.Region
}
if a.config.DataDir != "" {
conf.StateDir = filepath.Join(a.config.DataDir, "client")
conf.AllocDir = filepath.Join(a.config.DataDir, "alloc")
}
if a.config.Client.StateDir != "" {
conf.StateDir = a.config.Client.StateDir
}
if a.config.Client.AllocDir != "" {
conf.AllocDir = a.config.Client.AllocDir
}
conf.Servers = a.config.Client.Servers
// Setup the node