Fix swarm functional tests

We are using the tcp protocol for swarm in template_def
of the swarm driver and docker-py before 1.8.0 has a bug
in authenticating with tls using tcp.

Use https in the swarm functional tests.

Change-Id: I32b58cf567f4ae5597d9207b81f8546d1062b8b9
This commit is contained in:
Spyros Trigazis
2016-09-07 20:58:26 +02:00
parent 386a3e2c2c
commit 1edf9d3e02

View File

@@ -71,6 +71,9 @@ class TestSwarmAPIs(ClusterTest):
raise Exception(msg)
url = self.cs.clusters.get(self.cluster.uuid).api_address
# FIXME (strigazi) until we upgrade to docker-py 1.8.0 use
# only the https protocol instead of tcp.
https_url = url.replace('tcp', 'https')
# Note(eliqiao): docker_utils.CONF.docker.default_timeout is 10,
# tested this default configure option not works on gate, it will
@@ -80,7 +83,7 @@ class TestSwarmAPIs(ClusterTest):
docker_api_time_out = 180
self.docker_client = docker_utils.DockerHTTPClient(
url,
https_url,
CONF.docker.docker_remote_api_version,
docker_api_time_out,
client_key=self.key_file,
@@ -88,7 +91,7 @@ class TestSwarmAPIs(ClusterTest):
ca_cert=self.ca_file)
self.docker_client_non_tls = docker_utils.DockerHTTPClient(
url,
https_url,
CONF.docker.docker_remote_api_version,
docker_api_time_out)