Use docker-py version instead of git

Closes-Bug: #1390139

Change-Id: Ie79785cf20ec12fd544102c2672e7df29f4d1f5f

requirements.txt

@@ -3,13 +3,4 @@ PyYAML==3.10
 Mako==0.9.1
 requests==2.2.1
 six==1.5.2
-
-# We have to use custom version of docker
-# because docker 0.10 changed their api
-# and now volumes_from should be passed
-# on containers starting stage.
-# The patch for docker-py was merged but wasn't released
-# yet https://github.com/dotcloud/docker-py/pull/200
-# It's the reason why we use dependencies from
-# custom branch
-git+https://github.com/rustyrobot/docker-py.git@fixed-volumes#egg=docker-py
+docker-py==0.3.2

setup.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 import os
-import re
 
 from setuptools import find_packages
 from setuptools import setup
@@ -26,24 +25,16 @@ def parse_requirements_txt():
     root = os.path.dirname(os.path.abspath(__file__))
 
     requirements = []
-    dependencies = []
 
     with open(os.path.join(root, 'requirements.txt'), 'r') as f:
         for line in f.readlines():
             line = line.rstrip()
             if not line or line.startswith('#'):
                 continue
+            requirements.append(line)
 
-            egg = re.match('git\+.*#egg=(.*)$', line)
-            if egg is not None:
-                egg = egg.groups()[0]
-                requirements.append(egg)
-                dependencies.append(line)
-            else:
-                requirements.append(line)
-
-    return requirements, dependencies
-REQUIREMENTS, DEPENDENCIES = parse_requirements_txt()
+    return requirements
+REQUIREMENTS = parse_requirements_txt()
 
 
 setup(
@@ -61,7 +52,6 @@ setup(
     packages=find_packages(),
     zip_safe=False,
     install_requires=REQUIREMENTS,
-    dependency_links=DEPENDENCIES,
     include_package_data=True,
     package_data={'': ['*.yaml', 'templates/*']},
     entry_points={