scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Storing local and global cluster name/id to storage and returning them in health status

Browse Source
This commit is contained in:
vishalnayak
2016-07-26 02:25:33 -04:00
parent 1d0b055482
commit 55cf44bc91
8 changed files with 293 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
command/server/config.go
View File

@@ -33,6 +33,12 @@ type Config struct {
MaxLeaseTTLRaw string `hcl:"max_lease_ttl"`
DefaultLeaseTTL time.Duration `hcl:"-"`
DefaultLeaseTTLRaw string `hcl:"default_lease_ttl"`
LocalClusterName string `hcl:"local_cluster_name"`
LocalClusterID string `hcl:"local_cluster_id"`
GlobalClusterName string `hcl:"global_cluster_name"`
GlobalClusterID string `hcl:"global_cluster_id"`
}
// DevConfig is a Config that is used for dev mode of Vault.
@@ -277,6 +283,10 @@ func ParseConfig(d string) (*Config, error) {
"telemetry",
"default_lease_ttl",
"max_lease_ttl",
"local_cluster_name",
"local_cluster_id",
"global_cluster_name",
"global_cluster_id",
// TODO: Remove in 0.6.0
// Deprecated keys