From 287217cfee8e56d7391ab9f727d3c4097cf738aa Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Mon, 24 Jun 2024 13:47:41 +0200
Subject: [PATCH] Add installation of dbus package

In kolla-ansible, we perform a precheck to see if the python library for
dbus exists, but we do not install it in the bootstrap. This patch
addresses this issue by adding the installation of the dbus python
library.

Change-Id: Idfd4ffd0f80a2f22098639f81be69c664198b6c8
Closes-Bug: #2021585
(cherry picked from commit 1fd93d145a498e1d68e707701e6b3879a6505a58)
---
 roles/docker_sdk/defaults/main.yml | 2 ++
 roles/packages/defaults/main.yml   | 1 +
 roles/podman_sdk/defaults/main.yml | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/roles/docker_sdk/defaults/main.yml b/roles/docker_sdk/defaults/main.yml
index 23698ea..20cb92c 100644
--- a/roles/docker_sdk/defaults/main.yml
+++ b/roles/docker_sdk/defaults/main.yml
@@ -4,12 +4,14 @@ docker_sdk_packages:
   - "python3-setuptools"
   - "python3-pip"
   - "{% if docker_sdk_python_externally_managed | default(false) and virtualenv is none %}python3-docker{% endif %}"
+  - "{% if docker_sdk_python_externally_managed | default(false) and virtualenv is none %}python3-dbus{% endif %}"
 
 # List of Python packages to install via Pip.
 # NOTE(mnasiadka) docker 3.0.0 is in kolla-ansible requirements
 docker_sdk_pip_packages:
   - "docker>=6.0.0,<7.0.0"
   - "requests<2.32"
+  - "dbus-python"
 
 # APT cache TTL in seconds.
 apt_cache_valid_time: 3600
diff --git a/roles/packages/defaults/main.yml b/roles/packages/defaults/main.yml
index d8de293..c74ff60 100644
--- a/roles/packages/defaults/main.yml
+++ b/roles/packages/defaults/main.yml
@@ -15,6 +15,7 @@ ubuntu_pkg_install:
 
 openeuler_pkg_install:
  - python3-docker
+ - python3-dbus
 
 redhat_pkg_install:
  - git
diff --git a/roles/podman_sdk/defaults/main.yml b/roles/podman_sdk/defaults/main.yml
index 40e7c02..4095215 100644
--- a/roles/podman_sdk/defaults/main.yml
+++ b/roles/podman_sdk/defaults/main.yml
@@ -4,11 +4,13 @@ podman_sdk_packages:
   - "python3-setuptools"
   - "python3-pip"
   - "{% if podman_sdk_python_externally_managed | default(false) and virtualenv is none %}python3-podman{% endif %}"
+  - "{% if podman_sdk_python_externally_managed | default(false) and virtualenv is none %}python3-dbus{% endif %}"
 
 # List of Python packages to install via Pip.
 # NOTE(kevko) podman 4.7.0 is built in debian as apt package, so..
 podman_sdk_pip_packages:
   - "podman>=4.7.0"
+  - "dbus-python"
 
 # APT cache TTL in seconds.
 apt_cache_valid_time: 3600