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

Revert "config: address review comments" 

This reverts commit f6e9ad99ec6d230c1eb7f655d2a83e5a4e33807d.
This commit is contained in:
Frank Schroeder 2017-10-23 10:08:31 +02:00
parent c5c586c7f1
commit 64ac9f4f42
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/config/runtime.go
View File

@ -456,6 +456,7 @@ 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
@ -466,6 +467,7 @@ 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
@ -506,11 +508,8 @@ type RuntimeConfig struct {
// flag: -bootstrap // flag: -bootstrap
Bootstrap bool Bootstrap bool
// BootstrapExpect tries to automatically bootstrap the Consul cluster, by // BootstrapExpect tries to automatically bootstrap the Consul cluster,
// having servers wait to bootstrap until enough servers join, and then // by withholding peers until enough servers join.
// 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