From bb1dde04690719330fbbb47c4fb1161afe84ea0d Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Tue, 20 Sep 2016 18:54:19 +0200 Subject: [PATCH] Fix kv Signed-off-by: Emile Vauge --- provider/kv.go | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/provider/kv.go b/provider/kv.go index 4626473e8..1681b49b0 100644 --- a/provider/kv.go +++ b/provider/kv.go @@ -84,37 +84,6 @@ func (provider *Kv) watchKv(configurationChan chan<- types.ConfigMessage, prefix func (provider *Kv) provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints []types.Constraint) error { provider.Constraints = append(provider.Constraints, constraints...) - storeConfig := &store.Config{ - ConnectionTimeout: 30 * time.Second, - Bucket: "traefik", - } - - if provider.TLS != nil { - caPool := x509.NewCertPool() - - if provider.TLS.CA != "" { - ca, err := ioutil.ReadFile(provider.TLS.CA) - - if err != nil { - return fmt.Errorf("Failed to read CA. %s", err) - } - - caPool.AppendCertsFromPEM(ca) - } - - cert, err := tls.LoadX509KeyPair(provider.TLS.Cert, provider.TLS.Key) - - if err != nil { - return fmt.Errorf("Failed to load TLS keypair: %v", err) - } - - storeConfig.TLS = &tls.Config{ - Certificates: []tls.Certificate{cert}, - RootCAs: caPool, - InsecureSkipVerify: provider.TLS.InsecureSkipVerify, - } - } - operation := func() error { if _, err := provider.kvclient.Exists("qmslkjdfmqlskdjfmqlksjazçueznbvbwzlkajzebvkwjdcqmlsfj"); err != nil { return fmt.Errorf("Failed to test KV store connection: %v", err)