Sync with docker/libkv#75

docker-archive · Oct 5, 2015 · 79aa96f · 79aa96f
1 parent bd96e1a
commit 79aa96f
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/discovery/kv/kv.go b/discovery/kv/kv.go
@@ -76,13 +76,6 @@ func (s *Discovery) Initialize(uris string, heartbeat time.Duration, ttl time.Du
 			return err
 		}
 		config = &store.Config{
-			// Set ClientTLS to trigger https (bug in libkv/etcd)
-			ClientTLS: &store.ClientTLSConfig{
-				CACertFile: clusterOpts["kv.cacertfile"],
-				CertFile:   clusterOpts["kv.certfile"],
-				KeyFile:    clusterOpts["kv.keyfile"],
-			},
-			// The actual TLS config that will be used
 			TLS: tlsConfig,
 		}
 	} else {