Merge pull request #33 from hashicorp/f-network

Network config

command/agent/agent.go

@@ -58,13 +58,9 @@ func NewAgent(config *Config, logOutput io.Writer) (*Agent, error) {
 	return a, nil
 }
 
-// setupServer is used to setup the server if enabled
-func (a *Agent) setupServer() error {
-	if !a.config.Server.Enabled {
-		return nil
-	}
-
-	// Setup the configuration
+// serverConfig is used to generate a new server configuration struct
+// for initializing a nomad server.
+func (a *Agent) serverConfig() (*nomad.Config, error) {
 	conf := a.config.NomadConfig
 	if conf == nil {
 		conf = nomad.DefaultConfig()
@@ -102,26 +98,65 @@ func (a *Agent) setupServer() error {
 	if len(a.config.Server.EnabledSchedulers) != 0 {
 		conf.EnabledSchedulers = a.config.Server.EnabledSchedulers
 	}
-	if addr := a.config.Server.AdvertiseAddr; addr != "" {
-		tcpAddr, err := net.ResolveTCPAddr("tcp", addr)
+
+	// Set up the advertise addrs
+	if addr := a.config.AdvertiseAddrs.Serf; addr != "" {
+		serfAddr, err := net.ResolveTCPAddr("tcp", addr)
 		if err != nil {
-			return fmt.Errorf("failed to resolve advertise address: %v", err)
+			return nil, fmt.Errorf("error resolving serf advertise address: %s", err)
 		}
-		conf.RPCAdvertise = tcpAddr
+		conf.SerfConfig.MemberlistConfig.AdvertiseAddr = serfAddr.IP.String()
+		conf.SerfConfig.MemberlistConfig.AdvertisePort = serfAddr.Port
 	}
-	if addr := a.config.Server.BindAddr; addr != "" {
-		tcpAddr, err := net.ResolveTCPAddr("tcp", addr)
+	if addr := a.config.AdvertiseAddrs.RPC; addr != "" {
+		rpcAddr, err := net.ResolveTCPAddr("tcp", addr)
 		if err != nil {
-			return fmt.Errorf("failed to resolve bind address: %v", err)
+			return nil, fmt.Errorf("error resolving rpc advertise address: %s", err)
 		}
-		conf.RPCAddr = tcpAddr
+		conf.RPCAdvertise = rpcAddr
+	}
+
+	// Set up the bind addresses
+	if addr := a.config.BindAddr; addr != "" {
+		conf.RPCAddr.IP = net.ParseIP(addr)
+		conf.SerfConfig.MemberlistConfig.BindAddr = addr
+	}
+	if addr := a.config.Addresses.RPC; addr != "" {
+		conf.RPCAddr.IP = net.ParseIP(addr)
+	}
+	if addr := a.config.Addresses.Serf; addr != "" {
+		conf.SerfConfig.MemberlistConfig.BindAddr = addr
+	}
+
+	// Set up the ports
+	if port := a.config.Ports.RPC; port != 0 {
+		conf.RPCAddr.Port = port
+	}
+	if port := a.config.Ports.Serf; port != 0 {
+		conf.SerfConfig.MemberlistConfig.BindPort = port
+	}
+
+	return conf, nil
+}
+
+// setupServer is used to setup the server if enabled
+func (a *Agent) setupServer() error {
+	if !a.config.Server.Enabled {
+		return nil
+	}
+
+	// Setup the configuration
+	conf, err := a.serverConfig()
+	if err != nil {
+		return fmt.Errorf("server config setup failed: %s", err)
 	}
 
 	// Create the server
 	server, err := nomad.NewServer(conf)
 	if err != nil {
 		return fmt.Errorf("server setup failed: %v", err)
 	}
+
 	a.server = server
 	return nil
 }

command/agent/agent_test.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
+	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -79,3 +80,86 @@ func TestAgent_RPCPing(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 }
+
+func TestAgent_ServerConfig(t *testing.T) {
+	conf := DefaultConfig()
+	a := &Agent{config: conf}
+
+	// Returns error on bad serf addr
+	conf.AdvertiseAddrs.Serf = "nope"
+	_, err := a.serverConfig()
+	if err == nil || !strings.Contains(err.Error(), "serf advertise") {
+		t.Fatalf("expected serf address error, got: %#v", err)
+	}
+	conf.AdvertiseAddrs.Serf = "127.0.0.1:4000"
+
+	// Returns error on bad rpc addr
+	conf.AdvertiseAddrs.RPC = "nope"
+	_, err = a.serverConfig()
+	if err == nil || !strings.Contains(err.Error(), "rpc advertise") {
+		t.Fatalf("expected rpc address error, got: %#v", err)
+	}
+	conf.AdvertiseAddrs.RPC = "127.0.0.1:4001"
+
+	// Parses the advertise addrs correctly
+	out, err := a.serverConfig()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	serfAddr := out.SerfConfig.MemberlistConfig.AdvertiseAddr
+	if serfAddr != "127.0.0.1" {
+		t.Fatalf("expect 127.0.0.1, got: %s", serfAddr)
+	}
+	serfPort := out.SerfConfig.MemberlistConfig.AdvertisePort
+	if serfPort != 4000 {
+		t.Fatalf("expected 4000, got: %d", serfPort)
+	}
+	if addr := out.RPCAdvertise; addr.IP.String() != "127.0.0.1" || addr.Port != 4001 {
+		t.Fatalf("bad rpc advertise addr: %#v", addr)
+	}
+
+	// Sets up the ports properly
+	conf.Ports.RPC = 4003
+	conf.Ports.Serf = 4004
+
+	out, err = a.serverConfig()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	if addr := out.RPCAddr.Port; addr != 4003 {
+		t.Fatalf("expect 4003, got: %d", out.RPCAddr.Port)
+	}
+	if port := out.SerfConfig.MemberlistConfig.BindPort; port != 4004 {
+		t.Fatalf("expect 4004, got: %d", port)
+	}
+
+	// Prefers the most specific bind addrs
+	conf.BindAddr = "127.0.0.3"
+	conf.Addresses.RPC = "127.0.0.2"
+	conf.Addresses.Serf = "127.0.0.2"
+
+	out, err = a.serverConfig()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	if addr := out.RPCAddr.IP.String(); addr != "127.0.0.2" {
+		t.Fatalf("expect 127.0.0.2, got: %s", addr)
+	}
+	if addr := out.SerfConfig.MemberlistConfig.BindAddr; addr != "127.0.0.2" {
+		t.Fatalf("expect 127.0.0.2, got: %s", addr)
+	}
+
+	// Defaults to the global bind addr
+	conf.Addresses.RPC = ""
+	conf.Addresses.Serf = ""
+	out, err = a.serverConfig()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	if addr := out.RPCAddr.IP.String(); addr != "127.0.0.3" {
+		t.Fatalf("expect 127.0.0.3, got: %s", addr)
+	}
+	if addr := out.SerfConfig.MemberlistConfig.BindAddr; addr != "127.0.0.3" {
+		t.Fatalf("expect 127.0.0.3, got: %s", addr)
+	}
+}