From 22b64cebbe5499123c93569cd8a606ee94993eca Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 4 Oct 2016 14:20:11 +0200
Subject: [PATCH] Reestablish upper-cap for docker-py

This commit reverts ecdbd1a6e90360f08680f4bba06671fd6203dd47

Newer docker-py also introduces conflicts over requests and
tripleo-common. Reestablish upper cap until this is resolved.

Change-Id: I297785a4407822093d003cab17165941b034b40f
---
 global-requirements.txt | 2 +-
 upper-constraints.txt   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/global-requirements.txt b/global-requirements.txt
index 4187de8d25..31a3fbc2d0 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -310,7 +310,7 @@ cliff-tablib>=1.0  # Apache-2.0
 couchdb>=0.8 # Apache-2.0
 coverage>=3.6  # Apache-2.0
 demjson # GLGPLv3+
-docker-py>=1.6.0,!=1.8.0  # Apache-2.0
+docker-py>=1.6.0,<1.8.0  # Apache-2.0
 discover  # BSD
 django-nose>=1.4.4  # BSD
 doc8  # Apache-2.0
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 34e11aaf48..26748cb928 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -114,8 +114,7 @@ django-pyscss===2.0.2
 dnspython===1.14.0;python_version=='2.7'
 dnspython3===1.12.0;python_version=='3.4' or python_version=='3.5'
 doc8===0.7.0
-docker-py===1.10.3
-docker-pycreds===0.2.1
+docker-py===1.7.2
 docutils===0.12
 dogpile.cache===0.6.2
 dogtag-pki===10.3.5.1