Integrated TLS auth for etcd and consul

This commit is contained in:
Thomas Boerger 2016-02-19 17:10:48 +01:00
parent 331cd173ce
commit dc10c56b35
5 changed files with 129 additions and 11 deletions

View file

@ -222,6 +222,9 @@ func LoadConfiguration() *GlobalConfiguration {
if arguments.marathon {
viper.Set("marathon", arguments.Marathon)
}
if !arguments.consulTLS {
arguments.Consul.TLS = nil
}
if arguments.consul {
viper.Set("consul", arguments.Consul)
}
@ -231,6 +234,9 @@ func LoadConfiguration() *GlobalConfiguration {
if arguments.zookeeper {
viper.Set("zookeeper", arguments.Zookeeper)
}
if !arguments.etcdTLS {
arguments.Etcd.TLS = nil
}
if arguments.etcd {
viper.Set("etcd", arguments.Etcd)
}