2 Commits

Author SHA1 Message Date
Thomas Bechtold
e7cde3b2e5 heat_docker: Require docker instead of docker-py
docker-py was renamed to docker. Use docker with the version mentioned
in global-requirements.
Also docker.Client was renamed to docker.APIClient (see [1]).

[1]
https://docker-py.readthedocs.io/en/stable/change-log.html#breaking-changes

Change-Id: I041727c1817c55be5265cc77d6ab9b5db5bf5dcf
2018-01-12 16:21:51 +01:00
Jeff Peeler
69c662ac24 Rename docker directory to heat_docker
This directory was renamed in 4e8231, which made importing docker
(that is docker-py) difficult if not impossible in Python 2.x. So
rename it to something other than 'docker' to avoid that problem.

(setup.cfg has been modified with the new path)

Change-Id: I3cbb7c5d4b53f70e1dc6102881f8e05852341a9a
Related-bug: #1296758
2014-08-28 23:42:24 -04:00