Commit Graph

10 Commits

Author SHA1 Message Date
Daniel Hiltgen 3661b6e63b Add TLS support for libkv
This adds TLS support into the KV store for swarm.  The manage, join,
and list commands all have a new CLI argument, matching the docker engine
discovery backend.  This required adding the tlsconfig utility
package from docker engine.

Here's an example showing re-use of the cluster certs for the KV store:

    swarm manage --tlsverify \
        --tlscacert /etc/docker/ssl/ca.pem
        --tlscert /etc/docker/ssl/cert.pem
        --tlskey /etc/docker/ssl/key.pem
        --discovery-opt kv.cacertfile=/etc/docker/ssl/ca.pem
        --discovery-opt kv.certfile=/etc/docker/ssl/cert.pem
        --discovery-opt kv.keyfile=/etc/docker/ssl/key.pem
        --advertise 192.168.122.47:3376
        etcd://192.168.122.47:2379

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-12 13:33:08 -07:00
Victor Vieux be10798096 use proper append in test
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-26 11:49:36 -07:00
Alexandre Beslic f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00
Andrea Luzzardi 2106966d54 discovery: Watch tests for file and some other tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi d492feb7cc golint: DiscoveryService -> Discovery
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:26:39 -07:00
Kushal Pisavadia 78dba5d623 Remove prefixes from DiscoveryService implementations
All of these structs are public. Previously when they were used, they'd
look like the following:

 - `consul.ConsulDiscoveryService`
 - `etcd.EtcdDiscoveryService`
 - `file.FileDiscoveryService`
 - `nodes.NodesDiscoveryService`
 - `token.TokenDiscoveryService`
 - `zookeeper.ZkDiscoveryService`

As a result, they stuttered when read. This commit removes the
duplication of the package names on the struct so that they read better.

See also: https://golang.org/ref/spec#Import_declarations

Signed-off-by: Kushal Pisavadia <kushi.p@gmail.com>
2015-04-15 20:58:17 +01:00
Victor Vieux 5e41510484 udpate tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 10:41:18 -07:00
Yucong Sun b45a985b9b Ignoring # comments in file discovery.
Signed-off-by: Yucong Sun <sunyucong@email.com>
2015-04-07 23:11:57 +08:00
Chanwit Kaewkasi 882be558e8 add ip generator for file
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-03-12 15:49:58 +07:00
Victor Vieux d6baf8bbe2 add a few tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:18:45 +00:00