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

Merge pull request #1276 from hashicorp/f-consul-server-autojoin

Browse Source 
Teach Nomad servers how to fall back to Consul.
This commit is contained in:
Sean Chittenden
2016-06-16 14:40:45 -07:00
committed by GitHub
parent 9bf6fc51f1 b82f872a82
commit 5708560527
6 changed files with 244 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
command/agent/agent.go
View File

@@ -11,6 +11,7 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
"github.com/hashicorp/nomad/client"
@@ -110,7 +111,7 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
if a.config.Server.BootstrapExpect == 1 {
conf.Bootstrap = true
} else {
conf.BootstrapExpect = a.config.Server.BootstrapExpect
atomic.StoreInt32(&conf.BootstrapExpect, int32(a.config.Server.BootstrapExpect))
}
}
if a.config.DataDir != "" {
@@ -235,7 +236,7 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
return nil, fmt.Errorf("server_service_name must be set when auto_advertise is enabled")
}
// conf.ConsulConfig = a.config.Consul
conf.ConsulConfig = a.config.Consul
return conf, nil
}
@@ -377,7 +378,7 @@ func (a *Agent) setupServer() error {
}
// Create the server
server, err := nomad.NewServer(conf)
server, err := nomad.NewServer(conf, a.consulSyncer)
if err != nil {
return fmt.Errorf("server setup failed: %v", err)
}