diff options
| author | Matthew Vernon <mvernon@wikimedia.org> | 2022-10-17 09:47:14 +0100 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2022-12-20 17:14:34 -0800 |
| commit | 2593c4c56bf0131a6d28970e53b4ce2101ceaea8 (patch) | |
| tree | 5c9cc54aaa49be486053af3b954eaef8d5263e79 | |
| parent | 4ca7bdf93d471435278e0c1a3b1486f18fd67c0c (diff) | |
| download | swift-2593c4c56bf0131a6d28970e53b4ce2101ceaea8.tar.gz | |
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 <mvernon@wikimedia.org>
(cherry picked from commit cc033154ad4a4f345258457f3ceed9143fb3d46d)
(cherry picked from commit d05ddb03648d70e4b8612243bb8cd2ddf8ae6baa)
| -rw-r--r-- | py2-constraints.txt | 1 | ||||
| -rw-r--r-- | tools/playbooks/common/install_dependencies.yaml | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/py2-constraints.txt b/py2-constraints.txt index 5972cc323..02f536466 100644 --- a/py2-constraints.txt +++ b/py2-constraints.txt @@ -73,3 +73,4 @@ gitdb2===2.0.6 # Projects that are known to have had a final py2-supporting release bandit===1.6.2 +PasteDeploy==2.1.1 diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml index 7ae93c14a..9d7c2ae75 100644 --- a/tools/playbooks/common/install_dependencies.yaml +++ b/tools/playbooks/common/install_dependencies.yaml @@ -36,3 +36,12 @@ with_items: - crudini - eventlet + + - 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" |