X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a31038ebef04b7c8473222d90586ff8ae0a4a904..eb459d42be239bd579634884292d3606896792fd:/services/boot/consul.go diff --git a/services/boot/consul.go b/services/boot/consul.go index a536d1a685..e1015ae59d 100644 --- a/services/boot/consul.go +++ b/services/boot/consul.go @@ -41,7 +41,11 @@ func (cb *consulBooter) Boot(ctx context.Context) error { args := []string{ "agent", "-server", - "-advertise=127.0.0.1", + "-datacenter=" + cfg.SiteID, + "-dns-port=" + fmt.Sprintf("%d", cfg.Ports.ConsulDNS), + "-http-port=" + fmt.Sprintf("%d", cfg.Ports.ConsulHTTP), + "-serf-lan-bind=0.0.0.0:" + fmt.Sprintf("%d", cfg.Ports.ConsulSerfLAN), + "-serf-wan-bind=0.0.0.0:" + fmt.Sprintf("%d", cfg.Ports.ConsulSerfWAN), "-data-dir", dataDir, "-bootstrap-expect", fmt.Sprintf("%d", len(cfg.ControlHosts))} supervisor := newSupervisor(ctx, "consul", bin, args...) @@ -72,6 +76,7 @@ var consulCfg = api.DefaultConfig() func (cb *consulBooter) check(ctx context.Context) error { cfg := cfg(ctx) + consulCfg.Address = fmt.Sprintf("127.0.0.1:%d", cfg.Ports.ConsulHTTP) consulCfg.Datacenter = cfg.SiteID consul, err := api.NewClient(consulCfg) if err != nil {