From 1895213d2550e25bbc5313d67ee5b32f32adf970 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 5 Apr 2021 18:12:43 -0700
Subject: [PATCH] Update some constraints for py2

We've recently started seeing some failures in the gate related to these
projects, and they have final py2-supporting versions.

Change-Id: If81fc352c8b2b1f03f3fa7b79c56dfcf981ced70
---
 lower-constraints.txt                            | 1 +
 py2-constraints.txt                              | 3 +++
 tools/playbooks/common/install_dependencies.yaml | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 75450ecfc5..6437c5d7ba 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -78,3 +78,4 @@ urllib3==1.22
 voluptuous==0.11.1
 wrapt==1.10.11
 xattr==0.4
+pycadf===2.10.0
diff --git a/py2-constraints.txt b/py2-constraints.txt
index 5a9318b602..e2ac9eb434 100644
--- a/py2-constraints.txt
+++ b/py2-constraints.txt
@@ -73,3 +73,6 @@ gitdb2===2.0.6
 # Projects that are known to have had a final py2-supporting release
 bandit===1.6.2
 python-keystoneclient===3.22.0
+dnspython===1.16.0
+setuptools===44.1.1
+pycadf===2.10.0
diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml
index 687607fad4..714ddf50d9 100644
--- a/tools/playbooks/common/install_dependencies.yaml
+++ b/tools/playbooks/common/install_dependencies.yaml
@@ -40,4 +40,6 @@
         - nose
         - pyeclib
         - python-swiftclient
-        - mock
+        # For some reason, pip on py2 isn't smart enough to prevent us
+        # trying to install a too-new mock??
+        - 'mock<4'