diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-19 10:39:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-19 10:39:59 +0000 |
| commit | c38c70f003931d83606cf89996ed20add2eaa358 (patch) | |
| tree | 6e9ef5348b425603f4ffd6d6ccac7af6a0ec50d9 /contrib | |
| parent | 797c9d4d66e4cf15d62f4263a875704145b20da4 (diff) | |
| parent | e7cde3b2e5a7dd72ab8d0e3a3dde70715b7eba3e (diff) | |
| download | heat-c38c70f003931d83606cf89996ed20add2eaa358.tar.gz | |
Merge "heat_docker: Require docker instead of docker-py"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/heat_docker/heat_docker/resources/docker_container.py | 4 | ||||
| -rw-r--r-- | contrib/heat_docker/requirements.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/heat_docker/heat_docker/resources/docker_container.py b/contrib/heat_docker/heat_docker/resources/docker_container.py index 3c0368b90..b21225da6 100644 --- a/contrib/heat_docker/heat_docker/resources/docker_container.py +++ b/contrib/heat_docker/heat_docker/resources/docker_container.py @@ -332,9 +332,9 @@ class DockerContainer(resource.Resource): if DOCKER_INSTALLED: endpoint = self.properties.get(self.DOCKER_ENDPOINT) if endpoint: - client = docker.Client(endpoint) + client = docker.APIClient(endpoint) else: - client = docker.Client() + client = docker.APIClient() return client def _parse_networkinfo_ports(self, networkinfo): diff --git a/contrib/heat_docker/requirements.txt b/contrib/heat_docker/requirements.txt index ef8c26370..b72182632 100644 --- a/contrib/heat_docker/requirements.txt +++ b/contrib/heat_docker/requirements.txt @@ -1 +1 @@ -docker-py>=0.2.2 +docker>=2.4.2 # Apache-2.0 |