openstack
/
heat
Code Issues Proposed changes

Merge "heat_docker: Require docker instead of docker-py"

This commit is contained in:
Zuul 2018-02-19 10:39:59 +00:00 committed by Gerrit Code Review
parent 797c9d4d66 e7cde3b2e5
commit c38c70f003
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/heat_docker/heat_docker/resources/docker_container.py
View File

@ -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):

2
contrib/heat_docker/requirements.txt
View File

@ -1 +1 @@
docker-py>=0.2.2
docker>=2.4.2 # Apache-2.0