Consul catalog provider

Fixes #176
2016-02-02 18:03:40 +01:00 · 2016-02-02 18:03:40 +01:00 · ae275c9e60
commit ae275c9e60
parent 4277fe2fdb
12 changed files with 546 additions and 17 deletions
--- a/configuration.go
+++ b/configuration.go
@ -30,6 +30,7 @@ type GlobalConfiguration struct {
 	Web                       *WebProvider
 	Marathon                  *provider.Marathon
 	Consul                    *provider.Consul
+	ConsulCatalog             *provider.ConsulCatalog
 	Etcd                      *provider.Etcd
 	Zookeeper                 *provider.Zookepper
 	Boltdb                    *provider.BoltDb
@ -224,6 +225,9 @@ func LoadConfiguration() *GlobalConfiguration {
 	if arguments.consul {
 		viper.Set("consul", arguments.Consul)
 	}
+	if arguments.consulCatalog {
+		viper.Set("consulCatalog", arguments.ConsulCatalog)
+	}
 	if arguments.zookeeper {
 		viper.Set("zookeeper", arguments.Zookeeper)
 	}