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

config_parse split out defaults from ParseConfig

This commit is contained in:
Lang Martin 2019-06-11 15:14:24 -04:00
parent 93e7f60be5
commit ad56434472
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
command/agent/config_parse.go
View File

@ -14,6 +14,15 @@ import (
"github.com/hashicorp/nomad/nomad/structs/config" "github.com/hashicorp/nomad/nomad/structs/config"
) )
// ParseConfigDefault returns the configuration base
func ParseConfigDefault() *Config {
return &Config{
Consul: config.DefaultConsulConfig(),
Autopilot: config.DefaultAutopilotConfig(),
Vault: config.DefaultVaultConfig(),
}
}
func ParseConfigFile(path string) (*Config, error) { func ParseConfigFile(path string) (*Config, error) {
// slurp // slurp
var buf bytes.Buffer var buf bytes.Buffer
@ -36,10 +45,10 @@ func ParseConfigFile(path string) (*Config, error) {
Client: &ClientConfig{ServerJoin: &ServerJoin{}}, Client: &ClientConfig{ServerJoin: &ServerJoin{}},
ACL: &ACLConfig{}, ACL: &ACLConfig{},
Server: &ServerConfig{ServerJoin: &ServerJoin{}}, Server: &ServerConfig{ServerJoin: &ServerJoin{}},
Consul: config.DefaultConsulConfig(), Consul: &config.ConsulConfig{},
Autopilot: config.DefaultAutopilotConfig(), Autopilot: &config.AutopilotConfig{},
Telemetry: &Telemetry{}, Telemetry: &Telemetry{},
Vault: config.DefaultVaultConfig(), Vault: &config.VaultConfig{},
} }
err = hcl.Decode(c, buf.String()) err = hcl.Decode(c, buf.String())