openstack/kolla-ansible
Code Issues Proposed changes

Merge "baremetal: Install Docker SDK less than 5.0.0"

Browse Source
This commit is contained in:
Zuul 2021-05-19 13:23:59 +00:00 committed by Gerrit Code Review
commit bb3653b966
2 changed files with 8 additions and 1 deletions
ansible/roles/baremetal/tasks
install.yml
releasenotes/notes
bug-1928915-482b2d53bb2a4d92.yaml

3
ansible/roles/baremetal/tasks/install.yml

@ -137,7 +137,8 @@
- name: Install docker SDK for python
pip:
# NOTE(hrw) docker 2.4.2 is in kolla-ansible requirements
name: docker>=2.4.2
# NOTE(mnasiadka): docker 5.0.0 lacks six in deps but requires it
name: docker>=2.4.2,<5.0.0
executable: "{{ virtualenv is none | ternary('pip3', omit) }}"
virtualenv: "{{ virtualenv is none | ternary(omit, virtualenv) }}"
virtualenv_site_packages: "{{ virtualenv is none | ternary(omit, virtualenv_site_packages) }}"

6
releasenotes/notes/bug-1928915-482b2d53bb2a4d92.yaml Normal file

@ -0,0 +1,6 @@
---
fixes:
- |
Fixed an issue where docker python SDK 5.0.0 was failing due to missing
six - introduced a constraint to install version lower than 5.x.
`LP#1928915 <https://launchpad.net/bugs/1928915>`__