luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

remove resolving client rpc addr

This commit is contained in:
Alex Dadgar 2016-06-17 14:55:37 -07:00
parent c9f7467ccb
commit 9406739ba8
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
command/agent/agent.go
View File

@ -46,7 +46,6 @@ type Agent struct {
client *client.Client
clientHTTPAddr string
clientRPCAddr string
server *nomad.Server
serverHTTPAddr string
@ -329,22 +328,6 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
conf.Node.HTTPAddr = httpAddr
a.clientHTTPAddr = httpAddr
// Resolve the Client's RPC address
if a.config.AdvertiseAddrs.RPC != "" {
a.clientRPCAddr = a.config.AdvertiseAddrs.RPC
} else if a.config.Addresses.RPC != "" {
a.clientRPCAddr = fmt.Sprintf("%v:%v", a.config.Addresses.RPC, a.config.Ports.RPC)
} else if a.config.BindAddr != "" {
a.clientRPCAddr = fmt.Sprintf("%v:%v", a.config.BindAddr, a.config.Ports.RPC)
} else {
a.clientRPCAddr = fmt.Sprintf("%v:%v", "127.0.0.1", a.config.Ports.RPC)
}
addr, err = net.ResolveTCPAddr("tcp", a.clientRPCAddr)
if err != nil {
return nil, fmt.Errorf("error resolving RPC addr %+q: %v", a.clientRPCAddr, err)
}
a.clientRPCAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
// Reserve resources on the node.
r := conf.Node.Reserved
if r == nil {

2
demo/vagrant/client1.hcl
View File

@ -25,6 +25,8 @@ client {
}
}
bind_addr = "10.211.55.24"
# Modify our port to avoid a collision with server1
ports {
http = 5656