Skip to content

Commit

Permalink
py2constraints: pin PasteDeploy version
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
mcv21 committed Oct 17, 2022
1 parent 4ed2b89 commit cc03315
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions py2-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ dnspython===1.16.0
setuptools===44.1.1
pycadf===2.10.0
smmap===3.0.5
PasteDeploy==2.1.1
9 changes: 9 additions & 0 deletions tools/playbooks/common/install_dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit cc03315

Please sign in to comment.