github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

config: address review comments

pull/3585/head
Frank Schroeder 2017-10-23 08:05:47 +02:00
parent cf0a571a76
commit 21a7d399bd
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/config/runtime.go
View File

@ -456,7 +456,6 @@ type RuntimeConfig struct {
// Datacenter is exposed via /v1/agent/self from here and // Datacenter is exposed via /v1/agent/self from here and
// used in lots of places like CLI commands. Treat this as an interface // used in lots of places like CLI commands. Treat this as an interface
// that must be stable. // that must be stable.
// todo(fs): do we need this warning? RuntimeConfig was meant to be refactorable.
// //
// hcl: datacenter = string // hcl: datacenter = string
// flag: -datacenter string // flag: -datacenter string
@ -467,7 +466,6 @@ type RuntimeConfig struct {
// NodeName is exposed via /v1/agent/self from here and // NodeName is exposed via /v1/agent/self from here and
// used in lots of places like CLI commands. Treat this as an interface // used in lots of places like CLI commands. Treat this as an interface
// that must be stable. // that must be stable.
// todo(fs): do we need this warning? RuntimeConfig was meant to be refactorable.
// //
// hcl: node_name = string // hcl: node_name = string
// flag: -node string // flag: -node string
@ -508,8 +506,11 @@ type RuntimeConfig struct {
// flag: -bootstrap // flag: -bootstrap
Bootstrap bool Bootstrap bool
// BootstrapExpect tries to automatically bootstrap the Consul cluster, // BootstrapExpect tries to automatically bootstrap the Consul cluster, by
// by withholding peers until enough servers join. // having servers wait to bootstrap until enough servers join, and then
// performing the bootstrap process automatically. They will disable their
// automatic bootstrap process if they detect any servers that are part of
// an existing cluster, so it's safe to leave this set to a non-zero value.
// //
// hcl: bootstrap_expect = int // hcl: bootstrap_expect = int
// flag: -bootstrap-expect=int // flag: -bootstrap-expect=int