f695d6d70d
There were conflicting directives previously, both consul.addr and consul.address were required to achieve the desired behavior. The documentation said `consul.address` was the canonical name for the parameter, so consolidate configuration parameters to `consul.address`.
105 lines
2.9 KiB
Go
105 lines
2.9 KiB
Go
package config
|
|
|
|
// ConsulConfig contains the configuration information necessary to
|
|
// communicate with a Consul Agent in order to:
|
|
//
|
|
// - Register services and checks with Consul
|
|
//
|
|
// - Bootstrap this Nomad Client with the list of Nomad Servers registered
|
|
// with Consul
|
|
//
|
|
// Both the Agent and the executor need to be able to import ConsulConfig.
|
|
type ConsulConfig struct {
|
|
// ServerServiceName is the name of the service that Nomad uses to register
|
|
// servers with Consul
|
|
ServerServiceName string `mapstructure:"server_service_name"`
|
|
|
|
// ClientServiceName is the name of the service that Nomad uses to register
|
|
// clients with Consul
|
|
ClientServiceName string `mapstructure:"client_service_name"`
|
|
|
|
// AutoRegister determines if Nomad will register the Nomad client and
|
|
// server agents with Consul
|
|
AutoRegister bool `mapstructure:"auto_register"`
|
|
|
|
// Addr is the address of the local Consul agent
|
|
Addr string `mapstructure:"address"`
|
|
|
|
// Token is used to provide a per-request ACL token.This options overrides
|
|
// the agent's default token
|
|
Token string `mapstructure:"token"`
|
|
|
|
// Auth is the information to use for http access to Consul agent
|
|
Auth string `mapstructure:"auth"`
|
|
|
|
// EnableSSL sets the transport scheme to talk to the Consul agent as https
|
|
EnableSSL bool `mapstructure:"ssl"`
|
|
|
|
// VerifySSL enables or disables SSL verification when the transport scheme
|
|
// for the consul api client is https
|
|
VerifySSL bool `mapstructure:"verify_ssl"`
|
|
|
|
// CAFile is the path to the ca certificate used for Consul communication
|
|
CAFile string `mapstructure:"ca_file"`
|
|
|
|
// CertFile is the path to the certificate for Consul communication
|
|
CertFile string `mapstructure:"cert_file"`
|
|
|
|
// KeyFile is the path to the private key for Consul communication
|
|
KeyFile string `mapstructure:"key_file"`
|
|
|
|
// ServerAutoJoin enables Nomad servers to find peers by querying Consul and
|
|
// joining them
|
|
ServerAutoJoin bool `mapstructure:"server_auto_join"`
|
|
|
|
// ClientAutoJoin enables Nomad servers to find addresses of Nomad servers
|
|
// and register with them
|
|
ClientAutoJoin bool `mapstructure:"client_auto_join"`
|
|
}
|
|
|
|
// Merge merges two Consul Configurations together.
|
|
func (a *ConsulConfig) Merge(b *ConsulConfig) *ConsulConfig {
|
|
result := *a
|
|
|
|
if b.ServerServiceName != "" {
|
|
result.ServerServiceName = b.ServerServiceName
|
|
}
|
|
if b.ClientServiceName != "" {
|
|
result.ClientServiceName = b.ClientServiceName
|
|
}
|
|
if b.AutoRegister {
|
|
result.AutoRegister = true
|
|
}
|
|
if b.Addr != "" {
|
|
result.Addr = b.Addr
|
|
}
|
|
if b.Token != "" {
|
|
result.Token = b.Token
|
|
}
|
|
if b.Auth != "" {
|
|
result.Auth = b.Auth
|
|
}
|
|
if b.EnableSSL {
|
|
result.EnableSSL = true
|
|
}
|
|
if b.VerifySSL {
|
|
result.VerifySSL = true
|
|
}
|
|
if b.CAFile != "" {
|
|
result.CAFile = b.CAFile
|
|
}
|
|
if b.CertFile != "" {
|
|
result.CertFile = b.CertFile
|
|
}
|
|
if b.KeyFile != "" {
|
|
result.KeyFile = b.KeyFile
|
|
}
|
|
if b.ServerAutoJoin {
|
|
result.ServerAutoJoin = true
|
|
}
|
|
if b.ClientAutoJoin {
|
|
result.ClientAutoJoin = true
|
|
}
|
|
return &result
|
|
}
|