From 5ef58708c61b26767c341566249664e693328c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= Date: Wed, 19 May 2021 08:08:42 +0200 Subject: [PATCH] baremetal: Install Docker SDK less than 5.0.0 Docker 5.0.0 [1] dropped requirement for six, but still imports it. [1]: https://github.com/docker/docker-py/issues/2807 Closes-Bug: #1928915 Change-Id: I726541f4b3fdc357387a44c6a2153593a10bf282 (cherry picked from commit b053bd8ecf2cdbbdf83aeb6777e9502e5db70256) --- ansible/roles/baremetal/tasks/install.yml | 3 ++- releasenotes/notes/bug-1928915-482b2d53bb2a4d92.yaml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1928915-482b2d53bb2a4d92.yaml diff --git a/ansible/roles/baremetal/tasks/install.yml b/ansible/roles/baremetal/tasks/install.yml index 3a2e70dc6b..8b08946b2a 100644 --- a/ansible/roles/baremetal/tasks/install.yml +++ b/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) }}" diff --git a/releasenotes/notes/bug-1928915-482b2d53bb2a4d92.yaml b/releasenotes/notes/bug-1928915-482b2d53bb2a4d92.yaml new file mode 100644 index 0000000000..a009da5955 --- /dev/null +++ b/releasenotes/notes/bug-1928915-482b2d53bb2a4d92.yaml @@ -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 `__