From a931bf98e5a7ad922056febaf2f74639cd356468 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 22 Aug 2023 14:51:14 +0200 Subject: [PATCH] debian: Add Bookworm support Since Debian Bookworm does not support installing packages using pip outside of a venv - let's install python3-docker package when not using one. Change-Id: Ide845a4108607765fb3fe772f9bd30db054e2c92 (cherry picked from commit 19a684cb2ece2b830c7e7228269658b5e15e91f3) --- roles/docker_sdk/defaults/main.yml | 1 + roles/docker_sdk/tasks/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/docker_sdk/defaults/main.yml b/roles/docker_sdk/defaults/main.yml index 42e56fe..2f5b940 100644 --- a/roles/docker_sdk/defaults/main.yml +++ b/roles/docker_sdk/defaults/main.yml @@ -3,6 +3,7 @@ docker_sdk_packages: - "python3-setuptools" - "python3-pip" + - "{% if ansible_facts.distribution_release == 'bookworm' and virtualenv is none %}python3-docker{% endif %}" # List of Python packages to install via Pip. # NOTE(mnasiadka) docker 3.0.0 is in kolla-ansible requirements diff --git a/roles/docker_sdk/tasks/main.yml b/roles/docker_sdk/tasks/main.yml index 4b2ced1..f9ca898 100644 --- a/roles/docker_sdk/tasks/main.yml +++ b/roles/docker_sdk/tasks/main.yml @@ -28,3 +28,4 @@ virtualenv_command: "{{ virtualenv is none | ternary(omit, 'python' ~ host_python_version ~ ' -m venv') }}" become: true become_user: "{{ virtualenv is none | ternary(omit, docker_sdk_virtualenv_owner) }}" + when: not (ansible_facts.distribution_release == "bookworm" and virtualenv is none)