From cc033154ad4a4f345258457f3ceed9143fb3d46d Mon Sep 17 00:00:00 2001 From: Matthew Vernon Date: Mon, 17 Oct 2022 09:47:14 +0100 Subject: [PATCH] py2constraints: pin PasteDeploy version PasteDeploy version 3.0 (2022-10-16) dropped support for python2 (as well as <3.7), which causes our py2 tests to fail. So cap the version here at 2.1.1, the last which is compatible with our tests. Even doing this doesn't stop pip install swift pulling in a newer PasteDeploy in the tools/playbooks/saio_single_node_setup/make_rings.yaml playbook (causing the probes test on CentOS-7 to fail); so handle CentOS 7 explicitly. Change-Id: If69ae0f8eac8fe8ff7d5e4f4f1bff6d0ea9e7a8b Signed-off-by: Matthew Vernon --- py2-constraints.txt | 1 + tools/playbooks/common/install_dependencies.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/py2-constraints.txt b/py2-constraints.txt index af78a2708a..40a5e5d860 100644 --- a/py2-constraints.txt +++ b/py2-constraints.txt @@ -78,3 +78,4 @@ dnspython===1.16.0 setuptools===44.1.1 pycadf===2.10.0 smmap===3.0.5 +PasteDeploy==2.1.1 diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml index 714ddf50d9..6e2693a27f 100644 --- a/tools/playbooks/common/install_dependencies.yaml +++ b/tools/playbooks/common/install_dependencies.yaml @@ -43,3 +43,12 @@ # For some reason, pip on py2 isn't smart enough to prevent us # trying to install a too-new mock?? - 'mock<4' + + - name: install PasteDeploy - CentOS 7 + pip: name={{ item }} state=present extra_args='--upgrade' + with_items: + # py2_constraints isn't obeyed by pip install swift + - 'PasteDeploy==2.1.1' + when: + - ansible_facts['distribution'] == "CentOS" + - ansible_facts['distribution_major_version'] == "7"